diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-24 22:40:03 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-25 18:29:55 +0000 |
| commit | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (patch) | |
| tree | 02bd448d49627f059df0d8036fbdb9d9ee883a50 /Tools/PlatformQt.cmake | |
| parent | bd3f57b00bee3088971209a0ebc513eb1ef4ba14 (diff) | |
| download | qtwebkit-4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4.tar.gz | |
Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d
Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools/PlatformQt.cmake')
| -rw-r--r-- | Tools/PlatformQt.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Tools/PlatformQt.cmake b/Tools/PlatformQt.cmake index 311156446..9c5548aa3 100644 --- a/Tools/PlatformQt.cmake +++ b/Tools/PlatformQt.cmake @@ -2,7 +2,7 @@ remove_definitions(-DQT_ASCII_CAST_WARNINGS) add_subdirectory(QtTestBrowser) -if (ENABLE_API_TESTS) +if (ENABLE_API_TESTS AND NOT ENABLE_WEBKIT2) add_subdirectory(TestWebKitAPI) endif () @@ -10,3 +10,10 @@ if (ENABLE_TEST_SUPPORT) add_subdirectory(DumpRenderTree) add_subdirectory(ImageDiff) endif () + +if (ENABLE_WEBKIT2) + add_subdirectory(MiniBrowser/qt) +endif () + +# FIXME: Remove when WK2 Tools patches are merged +set(ENABLE_WEBKIT2 0) |