diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-14 00:59:13 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-13 22:23:05 +0000 |
| commit | 778e0c7c940f8a22f9a43290aef378fb707ca088 (patch) | |
| tree | 6c5d94b52c655e1bee56720005236e917603b63b /Source/WebKit2/UIProcess/API | |
| parent | 30af5bd74a1c035f0b3efc73767c0d2bef21333a (diff) | |
| download | qtwebkit-778e0c7c940f8a22f9a43290aef378fb707ca088.tar.gz | |
Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491
Change-Id: I3f9320f43d5d1fc5169a6c1b9dcea454974d6578
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/UIProcess/API')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp | 3 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp index c6f96f094..14c4db5a3 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp @@ -40,10 +40,11 @@ ****************************************************************************/ #include "config.h" -#include "qwebchannelwebkittransport_p.h" #if ENABLE(QT_WEBCHANNEL) +#include "qwebchannelwebkittransport_p.h" + #include "qquickwebview_p.h" #include <QJsonDocument> diff --git a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt index 899a9e038..210342ef5 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt +++ b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt @@ -84,6 +84,12 @@ set(qmltests_LIBRARIES ${Qt5Test_LIBRARIES} ) +if (SHARED_CORE) + list(APPEND qmltests_LIBRARIES + WebKit2 + ) +endif () + add_executable(tst_qmltests_WebView ${qmltests_SOURCES}) target_compile_definitions(tst_qmltests_WebView PRIVATE ${tst_qmltests_WebView_DEFINITIONS}) target_link_libraries(tst_qmltests_WebView ${qmltests_LIBRARIES}) |