diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-30 15:43:24 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:05 +0000 |
| commit | a0be5222b8695aed31664ab4e8e804632569ed64 (patch) | |
| tree | fe477e98b7aecd302b2176264046ceac0cfe6236 /Source/WTF/wtf | |
| parent | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (diff) | |
Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3
Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WTF/wtf')
| -rw-r--r-- | Source/WTF/wtf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/WTF/wtf/PlatformQt.cmake | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt index 6fd5bd830..09b848c7a 100644 --- a/Source/WTF/wtf/CMakeLists.txt +++ b/Source/WTF/wtf/CMakeLists.txt @@ -291,3 +291,5 @@ if (MSVC) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS") endif () + +QT_ADD_EXTRA_WEBKIT_TARGET_EXPORT(WTF) diff --git a/Source/WTF/wtf/PlatformQt.cmake b/Source/WTF/wtf/PlatformQt.cmake index 03e773736..42f4e86ff 100644 --- a/Source/WTF/wtf/PlatformQt.cmake +++ b/Source/WTF/wtf/PlatformQt.cmake @@ -15,6 +15,12 @@ list(APPEND WTF_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ) +if (QT_STATIC_BUILD) + list(APPEND WTF_LIBRARIES + ${STATIC_LIB_DEPENDENCIES} + ) +endif () + if (USE_GLIB) list(APPEND WTF_SOURCES glib/GRefPtr.cpp |