From 14db5329b4ae8e6e67b70b8f86a1c1dac8141eed Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 4 Mar 2020 20:16:37 +0300 Subject: Import QtWebKit commit c58d69686e6bdfb224c064a38333d6c6a981bf70 Change-Id: I87b5a5c95a2ed6b60842468c2a725f0522692121 Reviewed-by: Konstantin Tokarev --- Source/WebKit/PlatformQt.cmake | 5 ++--- Tools/QtTestBrowser/CMakeLists.txt | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake index 9aed9906e..9c44d43fc 100644 --- a/Source/WebKit/PlatformQt.cmake +++ b/Source/WebKit/PlatformQt.cmake @@ -289,10 +289,9 @@ if (ENABLE_GEOLOCATION) endif () if (USE_QT_MULTIMEDIA) - qt_wrap_cpp(WebKit WebKit_SOURCES - qt/Api/qwebfullscreenvideohandler.h - ) list(APPEND WebKit_SOURCES + qt/Api/qwebfullscreenvideohandler.h + qt/WebCoreSupport/FullScreenVideoQt.cpp ) endif () diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt index 19827fd02..e4c5d442d 100644 --- a/Tools/QtTestBrowser/CMakeLists.txt +++ b/Tools/QtTestBrowser/CMakeLists.txt @@ -25,6 +25,7 @@ set(QtTestBrowser_SOURCES qttestbrowser.cpp urlloader.cpp utils.cpp + webinspector.h webpage.cpp webview.cpp ) @@ -44,10 +45,6 @@ set(QtTestBrowser_LIBRARIES ${STATIC_LIB_DEPENDENCIES} ) -qt_wrap_cpp(WebKit QtTestBrowser_SOURCES - webinspector.h -) - qt5_add_resources(QtTestBrowser_SOURCES QtTestBrowser.qrc ) -- cgit v1.2.3