diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-26 13:55:39 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-26 18:56:55 +0000 |
commit | eaaf1391d58f17bde794d6c8634e092209898941 (patch) | |
tree | ff3702a6509dc9333ffd7515cf078cf69478fcc3 /Tools | |
parent | fdcba363c7e7e01790ba4b946e4f53f8600d8a20 (diff) | |
download | qtwebkit-eaaf1391d58f17bde794d6c8634e092209898941.tar.gz |
Import WebKit commit 17e8bfb1ff30314a838b9bf641c112f63a11dba4
Change-Id: Ib6549e44a04300c7b7b07ddc9094b823b37f3183
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp | 1 | ||||
-rw-r--r-- | Tools/DumpRenderTree/qt/EventSenderQt.cpp | 4 | ||||
-rw-r--r-- | Tools/MiniBrowser/qt/main.cpp | 1 | ||||
-rw-r--r-- | Tools/QtTestBrowser/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tools/QtTestBrowser/qttestbrowser.cpp | 1 | ||||
-rw-r--r-- | Tools/Scripts/update-qtwebkit-win-libs | 2 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/functions.prf | 2 | ||||
-rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 2 |
8 files changed, 12 insertions, 5 deletions
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp index e9c39f9b2..e72ee703a 100644 --- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp +++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp @@ -64,6 +64,7 @@ #include <QPrinter> #endif #include <QProgressBar> +#include <QRegExp> #include <QUndoStack> #include <QUrl> #include <limits.h> diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.cpp b/Tools/DumpRenderTree/qt/EventSenderQt.cpp index 666a2475e..563286526 100644 --- a/Tools/DumpRenderTree/qt/EventSenderQt.cpp +++ b/Tools/DumpRenderTree/qt/EventSenderQt.cpp @@ -576,7 +576,7 @@ void EventSender::gestureTap(int x, int y) m_gestures.clear(); m_gestures.append(&m_tapGesture); QGestureEvent event(m_gestures); - sendEvent(m_page, &event); + sendEvent(m_page->view(), &event); } void EventSender::gestureLongPress(int x, int y) @@ -585,7 +585,7 @@ void EventSender::gestureLongPress(int x, int y) m_gestures.clear(); m_gestures.append(&m_tapAndHoldGesture); QGestureEvent event(m_gestures); - sendEvent(m_page, &event); + sendEvent(m_page->view(), &event); } #endif diff --git a/Tools/MiniBrowser/qt/main.cpp b/Tools/MiniBrowser/qt/main.cpp index 4c8cd92ab..b688aa7ef 100644 --- a/Tools/MiniBrowser/qt/main.cpp +++ b/Tools/MiniBrowser/qt/main.cpp @@ -35,7 +35,6 @@ #include <QDir> #include <QLatin1String> -#include <QRegExp> int main(int argc, char** argv) { diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt index 485cd0ca1..ab625f6e5 100644 --- a/Tools/QtTestBrowser/CMakeLists.txt +++ b/Tools/QtTestBrowser/CMakeLists.txt @@ -67,3 +67,7 @@ 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") + +if (${CMAKE_BUILD_TYPE} MATCHES "Release") + set_target_properties(QtTestBrowser PROPERTIES WIN32_EXECUTABLE ON) +endif () diff --git a/Tools/QtTestBrowser/qttestbrowser.cpp b/Tools/QtTestBrowser/qttestbrowser.cpp index 4ec7425b1..24ca97a7a 100644 --- a/Tools/QtTestBrowser/qttestbrowser.cpp +++ b/Tools/QtTestBrowser/qttestbrowser.cpp @@ -47,6 +47,7 @@ WindowOptions windowOptions; #include <QFile> #include <QFileInfo> #include <QFontDatabase> +#include <QRegExp> int launcherMain(const QApplication& app) { diff --git a/Tools/Scripts/update-qtwebkit-win-libs b/Tools/Scripts/update-qtwebkit-win-libs index 8227ba933..da813f855 100644 --- a/Tools/Scripts/update-qtwebkit-win-libs +++ b/Tools/Scripts/update-qtwebkit-win-libs @@ -35,7 +35,7 @@ use FindBin; my $file = "qtwebkit-libs-win"; my $zipFile = "$file.zip"; -my $winQtLibsURL = "https://dl.dropboxusercontent.com/u/30021413/$zipFile"; +my $winQtLibsURL = "https://github.com/Vitallium/qtwebkit-libs-win/releases/download/2015/$zipFile"; my $command = "$FindBin::Bin/update-webkit-dependency"; system("perl", $command, $winQtLibsURL, ".") == 0 or die; diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf index 3a775dcfd..3e0d40610 100644 --- a/Tools/qmake/mkspecs/features/functions.prf +++ b/Tools/qmake/mkspecs/features/functions.prf @@ -51,6 +51,8 @@ defineReplace(appleSdkVersion) { } defineTest(isPlatformSupported) { + !qtHaveModule(widgets): skipBuild("QtWidgets module is required to build QtWebKit.") + cross_compile: skipBuild("cross-compilation of QtWebKit with qmake is not supported yet") requiredPrograms = cmake gperf python perl bison ruby flex diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index 1b8742c4a..e0c615b0a 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -70,7 +70,7 @@ build_pass|!debug_and_release { QMAKE_MAC_SDK_PATH = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version Path 2>/dev/null") } exists($$QMAKE_MAC_SDK_PATH): CMAKE_CONFIG += CMAKE_OSX_SYSROOT=$$QMAKE_MAC_SDK_PATH - !isEmpty($$QMAKE_MACOSX_DEPLOYMENT_TARGET): CMAKE_CONFIG += CMAKE_OSX_DEPLOYMENT_TARGET=$$QMAKE_MACOSX_DEPLOYMENT_TARGET + !isEmpty(QMAKE_MACOSX_DEPLOYMENT_TARGET): CMAKE_CONFIG += CMAKE_OSX_DEPLOYMENT_TARGET=$$QMAKE_MACOSX_DEPLOYMENT_TARGET } equals(QMAKE_HOST.os, Windows) { |