diff options
author | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:29:25 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:30:15 +0200 |
commit | db2ecc45564609f940ff564e777f76a1a4b734d4 (patch) | |
tree | d4756dffb486a2a1c64f13402bafd0327b7ddbb3 /Tools | |
parent | 8231f9776c2e4028937411bd2a0886aa72c97831 (diff) | |
parent | d10511e0a3f655ab2b1dfebfd9c17ade151a7cfe (diff) |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I006cd9023fadc5407bbaa2ddfda45cb8e88b548b
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/DumpRenderTree/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tools/MiniBrowser/qt/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tools/MiniBrowser/qt/icons/find.png | bin | 930 -> 122 bytes | |||
-rw-r--r-- | Tools/MiniBrowser/qt/icons/plus.png | bin | 1480 -> 360 bytes | |||
-rw-r--r-- | Tools/MiniBrowser/qt/icons/touch.png | bin | 6803 -> 444 bytes | |||
-rw-r--r-- | Tools/QtTestBrowser/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tools/QtTestBrowser/launcherwindow.cpp | 9 | ||||
-rw-r--r-- | Tools/QtTestBrowser/launcherwindow.h | 1 | ||||
-rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 27 | ||||
-rw-r--r-- | Tools/qt/jhbuild.modules | 7 | ||||
-rw-r--r-- | Tools/qt/manifest.txt | 1 |
11 files changed, 46 insertions, 7 deletions
diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt index eb7c1f4ff..db6ef4304 100644 --- a/Tools/DumpRenderTree/CMakeLists.txt +++ b/Tools/DumpRenderTree/CMakeLists.txt @@ -127,3 +127,7 @@ endif () if (WIN32) add_dependencies(DumpRenderTree DumpRenderTreeLib) endif () + +if (${PORT} STREQUAL "Qt") + set_target_properties(DumpRenderTree PROPERTIES AUTOMOC ON) +endif () diff --git a/Tools/MiniBrowser/qt/CMakeLists.txt b/Tools/MiniBrowser/qt/CMakeLists.txt index 0d5c7783f..e77d3bd54 100644 --- a/Tools/MiniBrowser/qt/CMakeLists.txt +++ b/Tools/MiniBrowser/qt/CMakeLists.txt @@ -61,4 +61,4 @@ include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) add_executable(MiniBrowser ${MiniBrowser_SOURCES}) target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) -set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools") +set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools" AUTOMOC ON) diff --git a/Tools/MiniBrowser/qt/icons/find.png b/Tools/MiniBrowser/qt/icons/find.png Binary files differindex b76afa398..eb5a0ad97 100644 --- a/Tools/MiniBrowser/qt/icons/find.png +++ b/Tools/MiniBrowser/qt/icons/find.png diff --git a/Tools/MiniBrowser/qt/icons/plus.png b/Tools/MiniBrowser/qt/icons/plus.png Binary files differindex f6dfbd02d..671a23d38 100644 --- a/Tools/MiniBrowser/qt/icons/plus.png +++ b/Tools/MiniBrowser/qt/icons/plus.png diff --git a/Tools/MiniBrowser/qt/icons/touch.png b/Tools/MiniBrowser/qt/icons/touch.png Binary files differindex 182ae0fe8..4d956c5b6 100644 --- a/Tools/MiniBrowser/qt/icons/touch.png +++ b/Tools/MiniBrowser/qt/icons/touch.png diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt index f43bb7852..a091c9541 100644 --- a/Tools/QtTestBrowser/CMakeLists.txt +++ b/Tools/QtTestBrowser/CMakeLists.txt @@ -66,7 +66,7 @@ include_directories(${QtTestBrowser_INCLUDE_DIRECTORIES}) include_directories(SYSTEM ${QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES}) add_executable(QtTestBrowser ${QtTestBrowser_SOURCES}) target_link_libraries(QtTestBrowser ${QtTestBrowser_LIBRARIES}) -set_target_properties(QtTestBrowser PROPERTIES FOLDER "Tools") +set_target_properties(QtTestBrowser PROPERTIES FOLDER "Tools" AUTOMOC ON) if (${CMAKE_BUILD_TYPE} MATCHES "Release") set_target_properties(QtTestBrowser PROPERTIES WIN32_EXECUTABLE ON) diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp index 26b6dce79..0fd64654e 100644 --- a/Tools/QtTestBrowser/launcherwindow.cpp +++ b/Tools/QtTestBrowser/launcherwindow.cpp @@ -353,6 +353,10 @@ void LauncherWindow::createChrome() touchMockAction->setCheckable(true); touchMockAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_T)); + QAction* toggleWebSecurity = toolsMenu->addAction("Disable Web Security", this, SLOT(toggleWebSecurity(bool))); + toggleWebSecurity->setCheckable(true); + toggleWebSecurity->setChecked(false); + toolsMenu->addSeparator(); QAction* toggleLocalStorage = toolsMenu->addAction("Enable Local Storage", this, SLOT(toggleLocalStorage(bool))); @@ -1001,6 +1005,11 @@ void LauncherWindow::togglePrivateBrowsing(bool enable) page()->settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, enable); } +void LauncherWindow::toggleWebSecurity(bool enable) +{ + page()->settings()->setAttribute(QWebSettings::WebSecurityEnabled, !enable); +} + void LauncherWindow::setUseDiskCookies(bool enable) { testBrowserCookieJarInstance()->setDiskStorageEnabled(enable); diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h index 0b5ea32db..a05a6cd56 100644 --- a/Tools/QtTestBrowser/launcherwindow.h +++ b/Tools/QtTestBrowser/launcherwindow.h @@ -144,6 +144,7 @@ protected Q_SLOTS: void toggleJavascriptCanOpenWindows(bool enable); void toggleAutoLoadImages(bool enable); void togglePrivateBrowsing(bool enable); + void toggleWebSecurity(bool enable); void setUseDiskCookies(bool enable); void clearCookies(); void togglePlugins(bool enable); diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index 5603ed72e..fcab90880 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -12,6 +12,8 @@ CONFIG(debug, debug|release) { configuration = Release } +programExistsInPath(ninja): use_ninja = 1 + cmake_build_dir = $$system_quote($$system_path($$ROOT_BUILD_DIR/$$lower($$configuration))) toolchain_file = $$system_quote($$system_path($$ROOT_BUILD_DIR/qmake_toolchain.cmake)) @@ -82,6 +84,8 @@ build_pass|!debug_and_release { } } + !isEmpty(use_ninja): cmake_args += "-G Ninja" + equals(QMAKE_HOST.os, Windows) { if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) { cmake_generator = "NMake Makefiles JOM" @@ -93,10 +97,15 @@ build_pass|!debug_and_release { cmake_generator = "Unix Makefiles" make_command_name = make } - cmake_args += "-G \"$$cmake_generator\"" + isEmpty(use_ninja): cmake_args += "-G \"$$cmake_generator\"" + } else { + make_command_name = make } - !silent: make_args += "VERBOSE=1" + !silent { + make_args += "VERBOSE=1" + ninja_args += "-v" + } # Append additional platform options defined in CMAKE_CONFIG for (config, CMAKE_CONFIG): cmake_args += "-D$$config" @@ -115,7 +124,12 @@ build_pass|!debug_and_release { build_pass:build_all: default_target.target = all else: default_target.target = first - default_target.commands = cd $$cmake_build_dir && $(MAKE) $$make_args + + isEmpty(use_ninja) { + default_target.commands = cd $$cmake_build_dir && $(MAKE) $$make_args + } else { + default_target.commands = cd $$cmake_build_dir && ninja $$ninja_args + } QMAKE_EXTRA_TARGETS += default_target # When debug and release are built at the same time, don't install data files twice @@ -129,3 +143,10 @@ build_pass|!debug_and_release { install_target.commands = $(MAKE) -f $(MAKEFILE) install_impl $$make_args DESTDIR=$(INSTALL_ROOT) QMAKE_EXTRA_TARGETS += install_target } + +!build_pass:debug_and_release:!isEmpty(use_ninja) { + # Special GNU make target for the meta Makefile that ensures that our + # debug_and_release Makefiles won't both run ninja in parallel. + notParallel.target = .NOTPARALLEL + QMAKE_EXTRA_TARGETS += notParallel +} diff --git a/Tools/qt/jhbuild.modules b/Tools/qt/jhbuild.modules index f59f198df..b3e0c5101 100644 --- a/Tools/qt/jhbuild.modules +++ b/Tools/qt/jhbuild.modules @@ -124,14 +124,17 @@ <autotools id="libxml2" supports-non-srcdir-builds="no" - autogen-sh="./autogen.sh; ./configure --with-python=no"> + autogen-sh="./autogen.sh; ./configure --without-python --without-valid --without-xinclude --without-xptr --without-c14n --without-catalog --without-regexps --without-zlib --without-lzma --without-schemas --without-schematron --without-threads --without-legacy --without-http --without-iconv --with-icu"> + <dependencies> + <dep package="icu"/> + </dependencies> <branch module="/sources/libxml2-2.9.1.tar.gz" version="2.9.1" repo="xmlsoft.org" hash="sha256:fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb" md5sum="9c0cfef285d5c4a5c80d00904ddab380"/> </autotools> - <autotools id="libxslt"> + <autotools id="libxslt" autogenargs="--without-python"> <branch module="/sources/libxslt-${version}.tar.gz" version="1.1.29" repo="xmlsoft.org" hash="sha256:b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"/> diff --git a/Tools/qt/manifest.txt b/Tools/qt/manifest.txt index b7aeadcea..6fe3e9546 100644 --- a/Tools/qt/manifest.txt +++ b/Tools/qt/manifest.txt @@ -69,6 +69,7 @@ exclude Source/WebKit2/Resources file Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js # Windows-specific code +file Source/WTF/wtf/text/win file Source/WTF/wtf/threads/win/BinarySemaphoreWin.cpp file Source/WTF/wtf/win file Source/WebCore/platform/graphics/win/LocalWindowsContext.h |