diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-20 16:23:23 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-20 15:53:35 +0000 |
| commit | 72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da (patch) | |
| tree | 12aa46467fee26d430f543788c66a20a20f98396 /Source/WebKit | |
| parent | 79143ccfc158ec4fffc49eee600d600edb342b16 (diff) | |
Import WebKit commit 025cd3fc8d29620535309aa3e2ab7075aad36044
Change-Id: I39d60de0f241abc52c0c4eb174eba7882d576f24
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Source/WebKit/PlatformQt.cmake | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt index 82dc1e662..04117d563 100644 --- a/Source/WebKit/CMakeLists.txt +++ b/Source/WebKit/CMakeLists.txt @@ -70,11 +70,21 @@ if (${PORT} STREQUAL "Qt") if (MACOS_BUILD_FRAMEWORKS) set_target_properties(WebKit PROPERTIES - FRAMEWORK_VERSION 5 + FRAMEWORK_VERSION ${PROJECT_VERSION_MAJOR} + SOVERSION ${MACOS_COMPATIBILITY_VERSION} MACOSX_FRAMEWORK_IDENTIFIER org.qt-project.QtWebKit ) endif () + if (USE_LINKER_VERSION_SCRIPT) + set(VERSION_SCRIPT "${CMAKE_BINARY_DIR}/QtWebKit.version") + add_custom_command(TARGET WebKit PRE_LINK + COMMAND ${PERL_EXECUTABLE} ${TOOLS_DIR}/qt/generate-version-script.pl ${Qt5_VERSION} > ${VERSION_SCRIPT} + VERBATIM + ) + set_target_properties(WebKit PROPERTIES LINK_FLAGS -Wl,--version-script,${VERSION_SCRIPT}) + endif () + if (ENABLE_WEBKIT2) add_dependencies(WebKit WebKit2) endif () diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake index 3792def6f..6fe440be8 100644 --- a/Source/WebKit/PlatformQt.cmake +++ b/Source/WebKit/PlatformQt.cmake @@ -861,7 +861,8 @@ endif () if (MACOS_BUILD_FRAMEWORKS) set_target_properties(WebKitWidgets PROPERTIES - FRAMEWORK_VERSION 5 + FRAMEWORK_VERSION ${PROJECT_VERSION_MAJOR} + SOVERSION ${MACOS_COMPATIBILITY_VERSION} MACOSX_FRAMEWORK_IDENTIFIER org.qt-project.QtWebKitWidgets ) endif () |