File 0001-Check-QtWebEngine-version-instead-of-Qt-s.... of Package messagelib

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Check-QtWebEngine-version-instead-of-Qt-s.patch of Package messagelib (Revision 52d0975cfb3098f3cf138826e157f9a0)

Currently displaying revision 52d0975cfb3098f3cf138826e157f9a0 , Show latest

From 569c3780a8f18830d7be24b7a7d40b755a2dbc60 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Thu, 25 Oct 2018 00:03:38 +0200
Subject: [PATCH] Check QtWebEngine version instead of Qt's

This code depends on the QtWebEngine (not Qt) version, so it should
actually check for that.

Otherwise it breaks if a distribution ships Qt 5.9 LTS together with a
newer QtWebEngine, like e.g. openSUSE Leap 15.0 does, or QtWebEngine
5.9 together with a newer Qt as is the case in FreeBSD.

BUG: 397349
CCBUG: 388440
FIXED-IN: 18.08.3
Differential Revision: https://phabricator.kde.org/D16398
---
 webengineviewer/src/webenginescript.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webengineviewer/src/webenginescript.cpp b/webengineviewer/src/webenginescript.cpp
index 2e9fcd44..ca668ff2 100644
--- a/webengineviewer/src/webenginescript.cpp
+++ b/webengineviewer/src/webenginescript.cpp
@@ -18,6 +18,7 @@
 */
 #include "webenginescript.h"
 #include <QDebug>
+#include <QtWebEngine/QtWebEngineVersion>
 using namespace WebEngineViewer;
 
 QString WebEngineScript::findAllImages()
@@ -126,7 +127,7 @@ QString WebEngineScript::searchElementPosition(const QString &elementStr)
 
 static QString scrollTop()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#if QTWEBENGINE_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     return QStringLiteral("document.documentElement.scrollTop");
 #else
     return QStringLiteral("document.body.scrollTop");
-- 
2.16.4

Places

File 0001-Check-QtWebEngine-version-instead-of-Qt-s.patch of Package messagelib (Revision 52d0975cfb3098f3cf138826e157f9a0)

Places