diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-11 12:44:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-11 12:44:19 +0200 |
| commit | ab1bd15209abaf7effc51dbc2f272c5681af7223 (patch) | |
| tree | 680bfbc4ab13514a9d2288609377bd8461f1d9f6 /Source/WebCore | |
| parent | 5909e6d0d10de3e1370b3ea0bc596f580101e3b4 (diff) | |
| parent | 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 (diff) | |
| download | qtwebkit-dev.tar.gz | |
Change-Id: I2b773e6958cf1d3699ff7887f2807572f1dafa8d
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/dom/Document.cpp | 6 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 1bca2d0a6..19355f166 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) unsigned i = 0; UChar32 c; - U16_NEXT(characters, i, length, c) + U16_NEXT(characters, i, length, c); if (!isValidNameStart(c)) return false; while (i < length) { - U16_NEXT(characters, i, length, c) + U16_NEXT(characters, i, length, c); if (!isValidNamePart(c)) return false; } @@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S for (unsigned i = 0; i < length;) { UChar32 c; - U16_NEXT(qualifiedName, i, length, c) + U16_NEXT(qualifiedName, i, length, c); if (c == ':') { if (sawColon) { ec = NAMESPACE_ERR; 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; |