diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2020-03-21 14:57:49 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2020-03-23 08:27:57 +0300 |
commit | 7b528379f143c791a42f73f9d70e432d796e440b (patch) | |
tree | a386ac2564ea377067f78df77a59a0db2a3515c6 | |
parent | 3e4baaf2687007b28361c6a46e7225089b7583ee (diff) |
Import QtWebKit commit 98f3c1fc89c86fe9ca6db003eaaad739961e52e8
Change-Id: Iac9a0bdcda4e45bca85c31832b2c1710c194a44c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
-rw-r--r-- | Source/CMakeLists.txt | 8 | ||||
-rw-r--r-- | Source/WebKit/PlatformQt.cmake | 13 | ||||
-rw-r--r-- | Source/WebKit2/PlatformQt.cmake | 4 | ||||
-rw-r--r-- | Source/cmake/OptionsQt.cmake | 35 | ||||
-rw-r--r-- | Tools/qt/conanfile.py | 108 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/tests.pro | 2 | ||||
-rw-r--r-- | tests/webkitqml/CMakeLists.txt (renamed from Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tests/webkitqml/bytearraytestdata.cpp (renamed from Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.cpp) | 0 | ||||
-rw-r--r-- | tests/webkitqml/bytearraytestdata.h (renamed from Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h) | 0 | ||||
-rw-r--r-- | tests/webkitqml/html/basic_page.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/basic_page.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/html/basic_page2.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/basic_page2.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/html/bluesquare.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/bluesquare.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/html/direct-image-compositing.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/direct-image-compositing.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/html/inputmethod.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/inputmethod.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/html/redsquare.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/redsquare.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/html/resources/qwkview_noBackground1.png (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/resources/qwkview_noBackground1.png) | bin | 801 -> 801 bytes | |||
-rw-r--r-- | tests/webkitqml/html/resources/qwkview_noBackground3.png (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/resources/qwkview_noBackground3.png) | bin | 827 -> 827 bytes | |||
-rw-r--r-- | tests/webkitqml/html/resources/qwkview_paint.png (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/resources/qwkview_paint.png) | bin | 728 -> 728 bytes | |||
-rw-r--r-- | tests/webkitqml/html/resources/simple_image.png (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/resources/simple_image.png) | bin | 10585 -> 10585 bytes | |||
-rw-r--r-- | tests/webkitqml/html/scroll.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/html/scroll.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/inspectorserver/inspectorserver.pro (renamed from Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro) | 0 | ||||
-rw-r--r-- | tests/webkitqml/inspectorserver/tst_inspectorserver.cpp (renamed from Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp) | 0 | ||||
-rw-r--r-- | tests/webkitqml/publicapi/publicapi.pro (renamed from Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro) | 0 | ||||
-rw-r--r-- | tests/webkitqml/publicapi/tst_publicapi.cpp (renamed from Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/DesktopBehavior.pro (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/DesktopBehavior/tst_linkHovered.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/DesktopBehavior/tst_loadHtml.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_loadHtml.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/DesktopBehavior/tst_navigationRequested.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView.pro (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_applicationScheme.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_colorChooser.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_colorChooser.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_doubleTapToZoom.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml) | 10 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_download.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_download.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_evaluateJavaScript.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_favIconLoad.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_favIconLoad.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_findText.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_findText.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_fitToView.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml) | 4 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_geopermission.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_geopermission.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_itemSelector.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_itemSelector.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_javaScriptDialogs.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_javaScriptDialogs.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_loadFail.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadFail.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_loadHtml.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadHtml.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_loadProgress.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgress.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_loadProgressSignal.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgressSignal.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_loadUrl.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml) | 1 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_messaging.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_messaging.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_multiFileUpload.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_multiFileUpload.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_navigationHistory.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_navigationHistory.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_notification.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_notification.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_origin.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_origin.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_preferences.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml) | 1 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_properties.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_properties.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_resize.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_resize.qml) | 3 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_singleFileUpload.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_singleFileUpload.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_titleChanged.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_titleChanged.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_userScripts.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_userScripts.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_webchannel.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/tst_wheelEventHandling.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_wheelEventHandling.qml) | 4 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/TestWebView.qml (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/TestWebView.qml) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/alert.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/alert.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/append-document-title.js (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/append-document-title.js) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/big-user-script.js (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/big-user-script.js) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/change-document-title.js (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/change-document-title.js) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/colorChooser.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/colorChooser.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/confirm.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/confirm.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/download.zip (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/download.zip) | bin | 325 -> 325 bytes | |||
-rw-r--r-- | tests/webkitqml/qmltests/common/evaluatejavascript.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/evaluatejavascript.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/favicon.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/favicon.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/favicon.png (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/favicon.png) | bin | 3961 -> 3961 bytes | |||
-rw-r--r-- | tests/webkitqml/qmltests/common/favicon2.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/favicon2.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/font-preferences.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/font-preferences.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/geolocation.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/geolocation.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/javascript.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/javascript.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/link.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/link.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/localStorage.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/localStorage.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/messaging.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/messaging.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/multifileupload.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/multifileupload.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/notification.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/notification.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/prompt.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/prompt.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/qrctest.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/qrctest.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/redirect.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/redirect.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/select.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/select.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/selectwithsize.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/selectwithsize.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/singlefileupload.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/singlefileupload.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/small-favicon.png (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/small-favicon.png) | bin | 891 -> 891 bytes | |||
-rw-r--r-- | tests/webkitqml/qmltests/common/test1.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test1.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/test2.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test2.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/test3.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test3.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/test4.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test4.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/test5.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test5.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/titleupdate.js (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/titleupdate.js) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/common/webchannel.html (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/webchannel.html) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/qmltests.pro (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/resources.qrc (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/resources.qrc) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/tst_qmltests.cpp (renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qquickwebview/qquickwebview.pro (renamed from Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qquickwebview/tst_qquickwebview.cpp (renamed from Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qrawwebview/qrawwebview.pro (renamed from Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro) | 0 | ||||
-rw-r--r-- | tests/webkitqml/qrawwebview/tst_qrawwebview.cpp (renamed from Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp) | 0 | ||||
-rw-r--r-- | tests/webkitqml/tests.pri (renamed from Source/WebKit2/UIProcess/API/qt/tests/tests.pri) | 3 | ||||
-rw-r--r-- | tests/webkitqml/testwindow.h (renamed from Source/WebKit2/UIProcess/API/qt/tests/testwindow.h) | 0 | ||||
-rw-r--r-- | tests/webkitqml/util.cpp (renamed from Source/WebKit2/UIProcess/API/qt/tests/util.cpp) | 0 | ||||
-rw-r--r-- | tests/webkitqml/util.h (renamed from Source/WebKit2/UIProcess/API/qt/tests/util.h) | 0 | ||||
-rw-r--r-- | tests/webkitqml/webkitqml.pro | 2 |
105 files changed, 154 insertions, 48 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index a473dbf14..d7684b39c 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -24,14 +24,14 @@ if (USE_WOFF2 AND NOT WOFF2DEC_FOUND) add_subdirectory(ThirdParty/woff2) endif () -if (ENABLE_WEBKIT) - add_subdirectory(WebKit) -endif () - if (ENABLE_WEBKIT2) add_subdirectory(WebKit2) endif () +if (ENABLE_WEBKIT) + add_subdirectory(WebKit) +endif () + WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() # ----------------------------------------------------------------------------- diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake index 9c44d43fc..65c1ff1c1 100644 --- a/Source/WebKit/PlatformQt.cmake +++ b/Source/WebKit/PlatformQt.cmake @@ -250,15 +250,15 @@ list(REMOVE_DUPLICATES WebKit_SYSTEM_INCLUDE_DIRECTORIES) if (ENABLE_WEBKIT2) if (APPLE) - set(WEBKIT2_LIBRARY -Wl,-force_load WebKit2) + set(WEBKIT2_LIBRARY -Wl,-force_load $<TARGET_FILE:WebKit2>) elseif (MSVC) - set(WEBKIT2_LIBRARY "-WHOLEARCHIVE:WebKit2${CMAKE_DEBUG_POSTFIX}") + set(WEBKIT2_LIBRARY "-WHOLEARCHIVE:$<TARGET_FILE:WebKit2>") elseif (UNIX OR MINGW) - set(WEBKIT2_LIBRARY -Wl,--whole-archive WebKit2 -Wl,--no-whole-archive) + set(WEBKIT2_LIBRARY -Wl,--whole-archive $<TARGET_FILE:WebKit2> -Wl,--no-whole-archive) else () message(WARNING "Unknown system, linking with WebKit2 may fail!") - set(WEBKIT2_LIBRARY WebKit2) endif () + set(WEBKIT2_LIBRARY ${WEBKIT2_LIBRARY} WebKit2) # For linking dependencies endif () list(APPEND WebKit_LIBRARIES @@ -516,6 +516,10 @@ if (KDE_INSTALL_USE_QT_SYS_PATHS) BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" ) + set(WebKit_Private_PRI_ARGUMENTS + BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" + LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" + ) if (MACOS_BUILD_FRAMEWORKS) list(APPEND WebKit_PRI_ARGUMENTS INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKit.framework/Headers" @@ -524,6 +528,7 @@ if (KDE_INSTALL_USE_QT_SYS_PATHS) list(APPEND WebKit_Private_PRI_ARGUMENTS INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKit.framework/Headers/${PROJECT_VERSION}" INCLUDE_INSTALL_DIR2 "$$QT_MODULE_LIB_BASE/QtWebKit.framework/Headers/${PROJECT_VERSION}/QtWebKit" + MODULE_CONFIG "lib_bundle" ) else () list(APPEND WebKit_PRI_ARGUMENTS diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake index a033f1cf1..e920902f4 100644 --- a/Source/WebKit2/PlatformQt.cmake +++ b/Source/WebKit2/PlatformQt.cmake @@ -329,10 +329,6 @@ set(WEBKIT2_EXTRA_DEPENDENCIES WEBKIT_CREATE_FORWARDING_HEADERS(QtWebKit/private DIRECTORIES UIProcess/API/qt) -if (ENABLE_API_TESTS) - add_subdirectory(UIProcess/API/qt/tests) -endif () - file(GLOB WebKit2_PRIVATE_HEADERS UIProcess/API/qt/*_p.h) install( FILES diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index fb1112f41..ad775b11b 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -13,6 +13,7 @@ set(PROJECT_VERSION_STRING "${PROJECT_VERSION}") set(QT_CONAN_DIR "" CACHE PATH "Directory containing conanbuildinfo.cmake and conanfile.txt") if (QT_CONAN_DIR) + message(STATUS "Using conan directory: ${QT_CONAN_DIR}") find_program(CONAN_COMMAND NAMES conan PATHS $ENV{PIP3_PATH}) if (NOT CONAN_COMMAND) message(FATAL_ERROR "conan executable not found. Make sure that Conan is installed and available in PATH") @@ -420,40 +421,6 @@ if (WIN32) set(USE_SYSTEM_MALLOC 1) endif () -if (MSVC) - if (NOT WEBKIT_LIBRARIES_DIR) - if (DEFINED ENV{WEBKIT_LIBRARIES}) - set(WEBKIT_LIBRARIES_DIR "$ENV{WEBKIT_LIBRARIES}") - else () - set(WEBKIT_LIBRARIES_DIR "${CMAKE_SOURCE_DIR}/WebKitLibraries/win") - endif () - endif () - - include_directories("${CMAKE_BINARY_DIR}/DerivedSources/ForwardingHeaders" "${CMAKE_BINARY_DIR}/DerivedSources" "${WEBKIT_LIBRARIES_DIR}/include") - set(CMAKE_INCLUDE_PATH "${WEBKIT_LIBRARIES_DIR}/include") - # bundled FindZlib is strange - set(ZLIB_ROOT "${WEBKIT_LIBRARIES_DIR}/include") - if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86") - link_directories("${CMAKE_BINARY_DIR}/lib32" "${WEBKIT_LIBRARIES_DIR}/lib32") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib32) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib32) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin32) - set(CMAKE_LIBRARY_PATH "${WEBKIT_LIBRARIES_DIR}/lib32") - else () - link_directories("${CMAKE_BINARY_DIR}/lib64" "${WEBKIT_LIBRARIES_DIR}/lib64") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin64) - set(CMAKE_LIBRARY_PATH "${WEBKIT_LIBRARIES_DIR}/lib64") - endif () - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") -endif () - if (DEFINED ENV{SQLITE3SRCDIR}) get_filename_component(SQLITE3SRC_ABS_DIR $ENV{SQLITE3SRCDIR} ABSOLUTE) set(SQLITE3_SOURCE_DIR ${SQLITE3SRC_ABS_DIR} CACHE PATH "Path to SQLite sources to use instead of system library" FORCE) diff --git a/Tools/qt/conanfile.py b/Tools/qt/conanfile.py new file mode 100644 index 000000000..6baa4610a --- /dev/null +++ b/Tools/qt/conanfile.py @@ -0,0 +1,108 @@ +# Copyright (C) 2020 Konstantin Tokarev <annulen@yandex.ru> +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +from conans import ConanFile, CMake, tools + + +class QtWebKitConan(ConanFile): + name = "qtwebkit" + version = "5.212.0-alpha4" + license = "LGPL-2.0-or-later, LGPL-2.1-or-later, BSD-2-Clause" + url = "https://github.com/qtwebkit/qtwebkit" + description = "Qt port of WebKit" + topics = ( "qt", "browser-engine", "webkit", "qt5", "qml", "qtwebkit" ) + settings = "os", "compiler", "build_type", "arch" + generators = "cmake", "virtualenv" + exports_sources = "../../*" + no_copy_source = True + requires = ( + "icu/65.1@qtproject/stable", + "libxml2/2.9.10@qtproject/stable", + "libxslt/1.1.34@qtproject/stable", + "libjpeg-turbo/2.0.3@qtproject/stable", + "zlib/1.2.11", + + "libpng/1.6.37", + "sqlite3/3.31.1" + ) + default_options = { + "icu:shared": True, + "icu:data_packaging": "library", + + "libxml2:shared": True, + "libxml2:iconv": False, + "libxml2:icu": True, + "libxml2:zlib": False, + + "libxslt:shared": True, + + "libjpeg-turbo:shared": False + } +# For building with conan +# options = { +# "use_ccache": [True, False], +# "qt5_dir": "ANY" +# } +# build_requires = ( +# "ninja/1.9.0", +# "cmake/3.16.4" +# ) + + def build_requirements(self): + if self.settings.os == 'Linux': + if not tools.which('pkg-config'): + self.build_requires('pkg-config_installer/0.29.2@bincrafters/stable') + + # gperf python perl bison ruby flex + if not tools.which("gperf"): + self.build_requires("gperf_installer/3.1@conan/stable") + if not tools.which("perl"): + self.build_requires("strawberryperl/5.30.0.1") + if not tools.which("ruby"): + self.build_requires("ruby_installer/2.6.3@bincrafters/stable") + if not tools.which("bison"): + self.build_requires("bison_installer/3.3.2@bincrafters/stable") + if not tools.which("flex"): + self.build_requires("flex_installer/2.6.4@bincrafters/stable") + + def build(self): + cmake = CMake(self) + cmake.generator = "Ninja" + cmake.verbose = True + cmake.definitions["QT_CONAN_DIR"] = self.build_folder + + if self.options.use_ccache: + cmake.definitions["CMAKE_C_COMPILER_LAUNCHER"] = "ccache" + cmake.definitions["CMAKE_CXX_COMPILER_LAUNCHER"] = "ccache" + + if self.options.qt5_dir: + cmake.definitions["Qt5_DIR"] = self.options.qt5_dir + + print(self.source_folder) + print() + print(self.build_folder) + + cmake.configure() + + def package(self): + pass + + def package_info(self): + pass diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 306095ae0..d590cbe6b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1 +1,5 @@ add_subdirectory(webkitwidgets) + +if (ENABLE_WEBKIT2) + add_subdirectory(webkitqml) +endif () diff --git a/tests/tests.pro b/tests/tests.pro index 483a6691b..078e0758c 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,2 +1,4 @@ TEMPLATE = subdirs SUBDIRS += webkitwidgets +# QTFIXME: Check if QML API was built +SUBDIRS += webkitqml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt b/tests/webkitqml/CMakeLists.txt index 210342ef5..210342ef5 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt +++ b/tests/webkitqml/CMakeLists.txt diff --git a/Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.cpp b/tests/webkitqml/bytearraytestdata.cpp index b81c07610..b81c07610 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.cpp +++ b/tests/webkitqml/bytearraytestdata.cpp diff --git a/Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h b/tests/webkitqml/bytearraytestdata.h index 95b005f3a..95b005f3a 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h +++ b/tests/webkitqml/bytearraytestdata.h diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/basic_page.html b/tests/webkitqml/html/basic_page.html index 53726e4a6..53726e4a6 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/basic_page.html +++ b/tests/webkitqml/html/basic_page.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/basic_page2.html b/tests/webkitqml/html/basic_page2.html index f8cff2969..f8cff2969 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/basic_page2.html +++ b/tests/webkitqml/html/basic_page2.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/bluesquare.html b/tests/webkitqml/html/bluesquare.html index f4b639621..f4b639621 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/bluesquare.html +++ b/tests/webkitqml/html/bluesquare.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/direct-image-compositing.html b/tests/webkitqml/html/direct-image-compositing.html index 2fd91418a..2fd91418a 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/direct-image-compositing.html +++ b/tests/webkitqml/html/direct-image-compositing.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/inputmethod.html b/tests/webkitqml/html/inputmethod.html index dc9140f9d..dc9140f9d 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/inputmethod.html +++ b/tests/webkitqml/html/inputmethod.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/redsquare.html b/tests/webkitqml/html/redsquare.html index f70d2918a..f70d2918a 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/redsquare.html +++ b/tests/webkitqml/html/redsquare.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/resources/qwkview_noBackground1.png b/tests/webkitqml/html/resources/qwkview_noBackground1.png Binary files differindex c293f449e..c293f449e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/resources/qwkview_noBackground1.png +++ b/tests/webkitqml/html/resources/qwkview_noBackground1.png diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/resources/qwkview_noBackground3.png b/tests/webkitqml/html/resources/qwkview_noBackground3.png Binary files differindex 4fa53b135..4fa53b135 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/resources/qwkview_noBackground3.png +++ b/tests/webkitqml/html/resources/qwkview_noBackground3.png diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/resources/qwkview_paint.png b/tests/webkitqml/html/resources/qwkview_paint.png Binary files differindex 68743ac9e..68743ac9e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/resources/qwkview_paint.png +++ b/tests/webkitqml/html/resources/qwkview_paint.png diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/resources/simple_image.png b/tests/webkitqml/html/resources/simple_image.png Binary files differindex 4685399ca..4685399ca 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/resources/simple_image.png +++ b/tests/webkitqml/html/resources/simple_image.png diff --git a/Source/WebKit2/UIProcess/API/qt/tests/html/scroll.html b/tests/webkitqml/html/scroll.html index 6b9b2d652..6b9b2d652 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/html/scroll.html +++ b/tests/webkitqml/html/scroll.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro b/tests/webkitqml/inspectorserver/inspectorserver.pro index 4a8d86f80..4a8d86f80 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro +++ b/tests/webkitqml/inspectorserver/inspectorserver.pro diff --git a/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp b/tests/webkitqml/inspectorserver/tst_inspectorserver.cpp index 2ad673a4b..2ad673a4b 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp +++ b/tests/webkitqml/inspectorserver/tst_inspectorserver.cpp diff --git a/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro b/tests/webkitqml/publicapi/publicapi.pro index 02dc197c7..02dc197c7 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro +++ b/tests/webkitqml/publicapi/publicapi.pro diff --git a/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp b/tests/webkitqml/publicapi/tst_publicapi.cpp index c042a3494..c042a3494 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp +++ b/tests/webkitqml/publicapi/tst_publicapi.cpp diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro b/tests/webkitqml/qmltests/DesktopBehavior.pro index e8ac901f1..e8ac901f1 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro +++ b/tests/webkitqml/qmltests/DesktopBehavior.pro diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml b/tests/webkitqml/qmltests/DesktopBehavior/tst_linkHovered.qml index e035dc2a9..e035dc2a9 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml +++ b/tests/webkitqml/qmltests/DesktopBehavior/tst_linkHovered.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_loadHtml.qml b/tests/webkitqml/qmltests/DesktopBehavior/tst_loadHtml.qml index b50aec371..b50aec371 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_loadHtml.qml +++ b/tests/webkitqml/qmltests/DesktopBehavior/tst_loadHtml.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml b/tests/webkitqml/qmltests/DesktopBehavior/tst_navigationRequested.qml index 2aefce537..2aefce537 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml +++ b/tests/webkitqml/qmltests/DesktopBehavior/tst_navigationRequested.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro b/tests/webkitqml/qmltests/WebView.pro index 6c67da96e..6c67da96e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro +++ b/tests/webkitqml/qmltests/WebView.pro diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml b/tests/webkitqml/qmltests/WebView/tst_applicationScheme.qml index d25dcb9a8..d25dcb9a8 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml +++ b/tests/webkitqml/qmltests/WebView/tst_applicationScheme.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_colorChooser.qml b/tests/webkitqml/qmltests/WebView/tst_colorChooser.qml index b5152c2bb..b5152c2bb 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_colorChooser.qml +++ b/tests/webkitqml/qmltests/WebView/tst_colorChooser.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml b/tests/webkitqml/qmltests/WebView/tst_doubleTapToZoom.qml index d25f778bd..a3c49c479 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml +++ b/tests/webkitqml/qmltests/WebView/tst_doubleTapToZoom.qml @@ -81,6 +81,8 @@ Item { } function test_basic_zoomInAndBack() { + skip("https://github.com/qtwebkit/qtwebkit/issues/951") + webView.url = webView.content verify(webView.waitForViewportReady()) @@ -100,6 +102,8 @@ Item { } function test_double_zoomInAndBack() { + skip("https://github.com/qtwebkit/qtwebkit/issues/951") + webView.url = webView.content verify(webView.waitForViewportReady()) @@ -130,6 +134,8 @@ Item { } function test_double_zoomInAndBack2() { + skip("https://github.com/qtwebkit/qtwebkit/issues/951") + webView.url = webView.content verify(webView.waitForViewportReady()) @@ -160,6 +166,8 @@ Item { } function test_double_zoomInOutAndBack() { + skip("https://github.com/qtwebkit/qtwebkit/issues/951") + webView.url = webView.content verify(webView.waitForViewportReady()) @@ -190,6 +198,8 @@ Item { } function test_double_zoomInOutAndBack2() { + skip("https://github.com/qtwebkit/qtwebkit/issues/951") + webView.url = webView.content verify(webView.waitForViewportReady()) diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_download.qml b/tests/webkitqml/qmltests/WebView/tst_download.qml index 9f1d43231..9f1d43231 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_download.qml +++ b/tests/webkitqml/qmltests/WebView/tst_download.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml b/tests/webkitqml/qmltests/WebView/tst_evaluateJavaScript.qml index b4576af36..b4576af36 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml +++ b/tests/webkitqml/qmltests/WebView/tst_evaluateJavaScript.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_favIconLoad.qml b/tests/webkitqml/qmltests/WebView/tst_favIconLoad.qml index 4437b10a4..4437b10a4 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_favIconLoad.qml +++ b/tests/webkitqml/qmltests/WebView/tst_favIconLoad.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_findText.qml b/tests/webkitqml/qmltests/WebView/tst_findText.qml index f1ea15c50..f1ea15c50 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_findText.qml +++ b/tests/webkitqml/qmltests/WebView/tst_findText.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml b/tests/webkitqml/qmltests/WebView/tst_fitToView.qml index 01192a8af..73db99cd5 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml +++ b/tests/webkitqml/qmltests/WebView/tst_fitToView.qml @@ -72,6 +72,7 @@ Item { webView.url = webView.content verify(webView.waitForViewportReady()) + skip("https://github.com/qtwebkit/qtwebkit/issues/951") compare(documentSize(), "480x720") compare(test.contentsScale, 1.0) @@ -100,6 +101,7 @@ Item { webView.url = "../common/test5.html" verify(webView.waitForLoadSucceeded()) + skip("https://github.com/qtwebkit/qtwebkit/issues/951") compare(test.contentsScale, 0.5) // Add user interaction. @@ -117,7 +119,7 @@ Item { webView.url = "../common/test4.html" verify(webView.waitForLoadSucceeded()) - + skip("https://github.com/qtwebkit/qtwebkit/issues/951") compare(test.contentsScale, 2.0) // Add user interaction. diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_geopermission.qml b/tests/webkitqml/qmltests/WebView/tst_geopermission.qml index 41097bbcf..41097bbcf 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_geopermission.qml +++ b/tests/webkitqml/qmltests/WebView/tst_geopermission.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_itemSelector.qml b/tests/webkitqml/qmltests/WebView/tst_itemSelector.qml index 78ea6f94f..78ea6f94f 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_itemSelector.qml +++ b/tests/webkitqml/qmltests/WebView/tst_itemSelector.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_javaScriptDialogs.qml b/tests/webkitqml/qmltests/WebView/tst_javaScriptDialogs.qml index d77933dba..d77933dba 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_javaScriptDialogs.qml +++ b/tests/webkitqml/qmltests/WebView/tst_javaScriptDialogs.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadFail.qml b/tests/webkitqml/qmltests/WebView/tst_loadFail.qml index 51c1f7dd0..51c1f7dd0 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadFail.qml +++ b/tests/webkitqml/qmltests/WebView/tst_loadFail.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadHtml.qml b/tests/webkitqml/qmltests/WebView/tst_loadHtml.qml index 297c082e5..297c082e5 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadHtml.qml +++ b/tests/webkitqml/qmltests/WebView/tst_loadHtml.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgress.qml b/tests/webkitqml/qmltests/WebView/tst_loadProgress.qml index 2f95ef11d..2f95ef11d 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgress.qml +++ b/tests/webkitqml/qmltests/WebView/tst_loadProgress.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgressSignal.qml b/tests/webkitqml/qmltests/WebView/tst_loadProgressSignal.qml index 620686003..620686003 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgressSignal.qml +++ b/tests/webkitqml/qmltests/WebView/tst_loadProgressSignal.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml b/tests/webkitqml/qmltests/WebView/tst_loadUrl.qml index 0f8f6a1ff..b20037197 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml +++ b/tests/webkitqml/qmltests/WebView/tst_loadUrl.qml @@ -75,6 +75,7 @@ TestWebView { webView.url = bogusSite compare(webView.url, bogusSite) verify(webView.waitForLoadFailed()) + skip("https://github.com/qtwebkit/qtwebkit/issues/951") compare(webView.url, bogusSite) webView.url = "about:blank" // Reset from previous test diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_messaging.qml b/tests/webkitqml/qmltests/WebView/tst_messaging.qml index 9f16bb8b6..9f16bb8b6 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_messaging.qml +++ b/tests/webkitqml/qmltests/WebView/tst_messaging.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_multiFileUpload.qml b/tests/webkitqml/qmltests/WebView/tst_multiFileUpload.qml index 15bb0bf7c..15bb0bf7c 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_multiFileUpload.qml +++ b/tests/webkitqml/qmltests/WebView/tst_multiFileUpload.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_navigationHistory.qml b/tests/webkitqml/qmltests/WebView/tst_navigationHistory.qml index 3b51c9cc1..3b51c9cc1 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_navigationHistory.qml +++ b/tests/webkitqml/qmltests/WebView/tst_navigationHistory.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_notification.qml b/tests/webkitqml/qmltests/WebView/tst_notification.qml index aa432f60c..aa432f60c 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_notification.qml +++ b/tests/webkitqml/qmltests/WebView/tst_notification.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_origin.qml b/tests/webkitqml/qmltests/WebView/tst_origin.qml index 660ca7326..660ca7326 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_origin.qml +++ b/tests/webkitqml/qmltests/WebView/tst_origin.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml b/tests/webkitqml/qmltests/WebView/tst_preferences.qml index 71fa3eb9b..000a952e7 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml +++ b/tests/webkitqml/qmltests/WebView/tst_preferences.qml @@ -207,6 +207,7 @@ Item { titleSpy.clear() titleSpy.wait() + skip("https://github.com/qtwebkit/qtwebkit/issues/951") compare(unquote(webView.title), defaultStandardFontFamily) webView.experimental.preferences.standardFontFamily = "foobar" diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_properties.qml b/tests/webkitqml/qmltests/WebView/tst_properties.qml index 036ee9d86..036ee9d86 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_properties.qml +++ b/tests/webkitqml/qmltests/WebView/tst_properties.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_resize.qml b/tests/webkitqml/qmltests/WebView/tst_resize.qml index dea000868..86f4d720a 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_resize.qml +++ b/tests/webkitqml/qmltests/WebView/tst_resize.qml @@ -105,6 +105,7 @@ Item { } function test_resizeAfterNeutralZoom() { + skip("https://github.com/qtwebkit/qtwebkit/issues/951") webView.url = webView.content verify(webView.waitForViewportReady()) @@ -134,6 +135,8 @@ Item { } function test_resizeZoomedIn() { + skip("https://github.com/qtwebkit/qtwebkit/issues/951") + // Note that if we change the behavior of resize on zoomed-in content, for instance // to preserve the visible width (like rotate), this test will need to be updated. webView.url = webView.content diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_singleFileUpload.qml b/tests/webkitqml/qmltests/WebView/tst_singleFileUpload.qml index 30514a3b6..30514a3b6 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_singleFileUpload.qml +++ b/tests/webkitqml/qmltests/WebView/tst_singleFileUpload.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_titleChanged.qml b/tests/webkitqml/qmltests/WebView/tst_titleChanged.qml index 38e587d57..38e587d57 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_titleChanged.qml +++ b/tests/webkitqml/qmltests/WebView/tst_titleChanged.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_userScripts.qml b/tests/webkitqml/qmltests/WebView/tst_userScripts.qml index 3d15aca05..3d15aca05 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_userScripts.qml +++ b/tests/webkitqml/qmltests/WebView/tst_userScripts.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml b/tests/webkitqml/qmltests/WebView/tst_webchannel.qml index dfdcf7add..dfdcf7add 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml +++ b/tests/webkitqml/qmltests/WebView/tst_webchannel.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_wheelEventHandling.qml b/tests/webkitqml/qmltests/WebView/tst_wheelEventHandling.qml index aa6d711a1..3955e40a6 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_wheelEventHandling.qml +++ b/tests/webkitqml/qmltests/WebView/tst_wheelEventHandling.qml @@ -32,6 +32,8 @@ Item { } function test_wheelScrollEvent() { + skip("https://github.com/qtwebkit/qtwebkit/issues/951") + scrollSpy.clear() var centerPoint = Qt.point(webView.width / 2, webView.height / 2) test.wheelEvent(webView, centerPoint.x, centerPoint.y, -500); @@ -45,6 +47,8 @@ Item { } function test_wheelScrollEventAfterReload() { + skip("https://github.com/qtwebkit/qtwebkit/issues/951") + scrollSpy.clear() webView.reload() verify(webView.waitForViewportReady()) diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/TestWebView.qml b/tests/webkitqml/qmltests/common/TestWebView.qml index 5a05f9b3e..5a05f9b3e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/TestWebView.qml +++ b/tests/webkitqml/qmltests/common/TestWebView.qml diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/alert.html b/tests/webkitqml/qmltests/common/alert.html index a75b9a60f..a75b9a60f 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/alert.html +++ b/tests/webkitqml/qmltests/common/alert.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/append-document-title.js b/tests/webkitqml/qmltests/common/append-document-title.js index fb4a2a6f2..fb4a2a6f2 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/append-document-title.js +++ b/tests/webkitqml/qmltests/common/append-document-title.js diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/big-user-script.js b/tests/webkitqml/qmltests/common/big-user-script.js index e6e3d2b44..e6e3d2b44 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/big-user-script.js +++ b/tests/webkitqml/qmltests/common/big-user-script.js diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/change-document-title.js b/tests/webkitqml/qmltests/common/change-document-title.js index bdae45c21..bdae45c21 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/change-document-title.js +++ b/tests/webkitqml/qmltests/common/change-document-title.js diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/colorChooser.html b/tests/webkitqml/qmltests/common/colorChooser.html index b3254c3b8..b3254c3b8 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/colorChooser.html +++ b/tests/webkitqml/qmltests/common/colorChooser.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/confirm.html b/tests/webkitqml/qmltests/common/confirm.html index 5dd6081d4..5dd6081d4 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/confirm.html +++ b/tests/webkitqml/qmltests/common/confirm.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/download.zip b/tests/webkitqml/qmltests/common/download.zip Binary files differindex b5456351a..b5456351a 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/download.zip +++ b/tests/webkitqml/qmltests/common/download.zip diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/evaluatejavascript.html b/tests/webkitqml/qmltests/common/evaluatejavascript.html index 023e9ab7f..023e9ab7f 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/evaluatejavascript.html +++ b/tests/webkitqml/qmltests/common/evaluatejavascript.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/favicon.html b/tests/webkitqml/qmltests/common/favicon.html index c9f225c52..c9f225c52 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/favicon.html +++ b/tests/webkitqml/qmltests/common/favicon.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/favicon.png b/tests/webkitqml/qmltests/common/favicon.png Binary files differindex 35717cca5..35717cca5 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/favicon.png +++ b/tests/webkitqml/qmltests/common/favicon.png diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/favicon2.html b/tests/webkitqml/qmltests/common/favicon2.html index 5548b867f..5548b867f 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/favicon2.html +++ b/tests/webkitqml/qmltests/common/favicon2.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/font-preferences.html b/tests/webkitqml/qmltests/common/font-preferences.html index cbc11432d..cbc11432d 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/font-preferences.html +++ b/tests/webkitqml/qmltests/common/font-preferences.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/geolocation.html b/tests/webkitqml/qmltests/common/geolocation.html index 2d41cab3e..2d41cab3e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/geolocation.html +++ b/tests/webkitqml/qmltests/common/geolocation.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/javascript.html b/tests/webkitqml/qmltests/common/javascript.html index 7a3dc0a1c..7a3dc0a1c 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/javascript.html +++ b/tests/webkitqml/qmltests/common/javascript.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/link.html b/tests/webkitqml/qmltests/common/link.html index e791b7de4..e791b7de4 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/link.html +++ b/tests/webkitqml/qmltests/common/link.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/localStorage.html b/tests/webkitqml/qmltests/common/localStorage.html index a4e395f48..a4e395f48 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/localStorage.html +++ b/tests/webkitqml/qmltests/common/localStorage.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/messaging.html b/tests/webkitqml/qmltests/common/messaging.html index 7e3dd7230..7e3dd7230 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/messaging.html +++ b/tests/webkitqml/qmltests/common/messaging.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/multifileupload.html b/tests/webkitqml/qmltests/common/multifileupload.html index 7701ed4b5..7701ed4b5 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/multifileupload.html +++ b/tests/webkitqml/qmltests/common/multifileupload.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/notification.html b/tests/webkitqml/qmltests/common/notification.html index e9186a4fd..e9186a4fd 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/notification.html +++ b/tests/webkitqml/qmltests/common/notification.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/prompt.html b/tests/webkitqml/qmltests/common/prompt.html index f35e30204..f35e30204 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/prompt.html +++ b/tests/webkitqml/qmltests/common/prompt.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/qrctest.html b/tests/webkitqml/qmltests/common/qrctest.html index 98f25fb7e..98f25fb7e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/qrctest.html +++ b/tests/webkitqml/qmltests/common/qrctest.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/redirect.html b/tests/webkitqml/qmltests/common/redirect.html index 914e5e35a..914e5e35a 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/redirect.html +++ b/tests/webkitqml/qmltests/common/redirect.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/select.html b/tests/webkitqml/qmltests/common/select.html index 46080f6e4..46080f6e4 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/select.html +++ b/tests/webkitqml/qmltests/common/select.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/selectwithsize.html b/tests/webkitqml/qmltests/common/selectwithsize.html index f514c46cc..f514c46cc 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/selectwithsize.html +++ b/tests/webkitqml/qmltests/common/selectwithsize.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/singlefileupload.html b/tests/webkitqml/qmltests/common/singlefileupload.html index 38e345f4b..38e345f4b 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/singlefileupload.html +++ b/tests/webkitqml/qmltests/common/singlefileupload.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/small-favicon.png b/tests/webkitqml/qmltests/common/small-favicon.png Binary files differindex 4462752a5..4462752a5 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/small-favicon.png +++ b/tests/webkitqml/qmltests/common/small-favicon.png diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test1.html b/tests/webkitqml/qmltests/common/test1.html index 5c09f06ed..5c09f06ed 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test1.html +++ b/tests/webkitqml/qmltests/common/test1.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test2.html b/tests/webkitqml/qmltests/common/test2.html index 629c2a063..629c2a063 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test2.html +++ b/tests/webkitqml/qmltests/common/test2.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test3.html b/tests/webkitqml/qmltests/common/test3.html index 0c0e4eebf..0c0e4eebf 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test3.html +++ b/tests/webkitqml/qmltests/common/test3.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test4.html b/tests/webkitqml/qmltests/common/test4.html index 8f75af606..8f75af606 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test4.html +++ b/tests/webkitqml/qmltests/common/test4.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test5.html b/tests/webkitqml/qmltests/common/test5.html index 3630ea6bd..3630ea6bd 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test5.html +++ b/tests/webkitqml/qmltests/common/test5.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/titleupdate.js b/tests/webkitqml/qmltests/common/titleupdate.js index 2a5bac0ac..2a5bac0ac 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/titleupdate.js +++ b/tests/webkitqml/qmltests/common/titleupdate.js diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/webchannel.html b/tests/webkitqml/qmltests/common/webchannel.html index 940821209..940821209 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/webchannel.html +++ b/tests/webkitqml/qmltests/common/webchannel.html diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro b/tests/webkitqml/qmltests/qmltests.pro index 8ddc4484e..8ddc4484e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro +++ b/tests/webkitqml/qmltests/qmltests.pro diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/resources.qrc b/tests/webkitqml/qmltests/resources.qrc index f251865ef..f251865ef 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/resources.qrc +++ b/tests/webkitqml/qmltests/resources.qrc diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp b/tests/webkitqml/qmltests/tst_qmltests.cpp index e681daa0d..e681daa0d 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp +++ b/tests/webkitqml/qmltests/tst_qmltests.cpp diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro b/tests/webkitqml/qquickwebview/qquickwebview.pro index 4a8d86f80..4a8d86f80 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro +++ b/tests/webkitqml/qquickwebview/qquickwebview.pro diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp b/tests/webkitqml/qquickwebview/tst_qquickwebview.cpp index 7cf1ddb72..7cf1ddb72 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp +++ b/tests/webkitqml/qquickwebview/tst_qquickwebview.cpp diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro b/tests/webkitqml/qrawwebview/qrawwebview.pro index 02dc197c7..02dc197c7 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro +++ b/tests/webkitqml/qrawwebview/qrawwebview.pro diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp b/tests/webkitqml/qrawwebview/tst_qrawwebview.cpp index 208288d1e..208288d1e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp +++ b/tests/webkitqml/qrawwebview/tst_qrawwebview.cpp diff --git a/Source/WebKit2/UIProcess/API/qt/tests/tests.pri b/tests/webkitqml/tests.pri index a1133530d..0fb41b959 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/tests.pri +++ b/tests/webkitqml/tests.pri @@ -7,7 +7,8 @@ INCLUDEPATH += $$PWD SOURCES += ../util.cpp QT += testlib webkit -have?(QTQUICK) { + +qtHaveModule(quick) { QT += qml quick quick-private HEADERS += ../bytearraytestdata.h \ ../util.h diff --git a/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h b/tests/webkitqml/testwindow.h index 9d5d656e9..9d5d656e9 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h +++ b/tests/webkitqml/testwindow.h diff --git a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp b/tests/webkitqml/util.cpp index 3b0c45f7d..3b0c45f7d 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp +++ b/tests/webkitqml/util.cpp diff --git a/Source/WebKit2/UIProcess/API/qt/tests/util.h b/tests/webkitqml/util.h index 8711d5b1e..8711d5b1e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/util.h +++ b/tests/webkitqml/util.h diff --git a/tests/webkitqml/webkitqml.pro b/tests/webkitqml/webkitqml.pro new file mode 100644 index 000000000..2af7ec801 --- /dev/null +++ b/tests/webkitqml/webkitqml.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +# SUBDIRS += qmltests |