summaryrefslogtreecommitdiff
path: root/Source/WebCore/platform
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-11 12:44:19 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-11 12:44:19 +0200
commitab1bd15209abaf7effc51dbc2f272c5681af7223 (patch)
tree680bfbc4ab13514a9d2288609377bd8461f1d9f6 /Source/WebCore/platform
parent5909e6d0d10de3e1370b3ea0bc596f580101e3b4 (diff)
parent2eac3aeb98fca0e6c13aaaff481861c5ef679e68 (diff)
downloadqtwebkit-dev.tar.gz
Merge remote-tracking branch 'origin/5.212' into devHEADdev
Change-Id: I2b773e6958cf1d3699ff7887f2807572f1dafa8d
Diffstat (limited to 'Source/WebCore/platform')
-rw-r--r--Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp2
1 files changed, 1 insertions, 1 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;