diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-10-01 20:15:25 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-10-01 20:26:40 +0300 |
| commit | b47f584d07aec2d78ea4a5a5ccf2c761f44f5585 (patch) | |
| tree | 656bf6f3fc91e985823748c30cfd65a1bff35c70 | |
| parent | 3403d64c98fdeb6345d794ec0821929bf7cf1ec0 (diff) | |
Import QtWebKit commit 45c329ee23a9b898fe8e6f0b0ccef8680aab3098
Change-Id: Iebca31394d29eed00a48980825fdd70d93f04d86
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| -rw-r--r-- | Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp | 2 | ||||
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 2 | ||||
| -rw-r--r-- | Source/cmake/WebKitMacros.cmake | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index 6bf343087..72db3ebaf 100644 --- a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -1600,7 +1600,7 @@ void GraphicsContext::set3DTransform(const TransformationMatrix& transform) void GraphicsContext::setURLForRect(const URL& url, const IntRect& rect) { -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) && !defined(QT_NO_PDF) if (paintingDisabled()) return; diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index f980569bc..ec6081de0 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -20,7 +20,7 @@ if (QT_CONAN_DIR) include("${QT_CONAN_DIR}/conanbuildinfo.cmake") # Remove this workaround when libxslt package is fixed - string(REPLACE "include/libxslt" "include" replace_CONAN_INCLUDE_DIRS ${CONAN_INCLUDE_DIRS}) + string(REPLACE "include/libxslt" "include" replace_CONAN_INCLUDE_DIRS "${CONAN_INCLUDE_DIRS}") set(CONAN_INCLUDE_DIRS ${replace_CONAN_INCLUDE_DIRS}) # Remove this workaround when libxml2 package is fixed diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake index d58c73eb4..8d57af7af 100644 --- a/Source/cmake/WebKitMacros.cmake +++ b/Source/cmake/WebKitMacros.cmake @@ -288,10 +288,10 @@ macro(WEBKIT_FRAMEWORK _target) if (APPLE AND NOT PORT STREQUAL "GTK" AND NOT ${${_target}_LIBRARY_TYPE} MATCHES STATIC) set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE) if (${_target}_PUBLIC_HEADERS) - set_target_properties(${_target} PROPERTIES PUBLIC_HEADER "${${_target}_PUBLIC_HEADERS}}") + set_target_properties(${_target} PROPERTIES PUBLIC_HEADER "${${_target}_PUBLIC_HEADERS}") if (${_target}_PRIVATE_HEADERS) foreach (CURRENT_PRIVATE_HEADER ${${_target}_PRIVATE_HEADERS}) - set_property(SOURCE ${CURRENT_PRIVATE_HEADER} PROPERTY MACOSX_PACKAGE_LOCATION ${${_target}_PRIVATE_HEADERS_LOCATION} ) + set_property(SOURCE ${CURRENT_PRIVATE_HEADER} PROPERTY MACOSX_PACKAGE_LOCATION ${${_target}_PRIVATE_HEADERS_LOCATION}) endforeach () endif () endif () |