Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

Fix the fix for #391300 to require only QtWebEngine 5.10, not Qt 5.10

Browse Source 
QtWebEngine can be newer than the rest of Qt (e.g., on Fedora 27).

This fixes the version check in WebView::savePageAs to use a macro
defined in config.h.cmake based on the version of QtWebEngineWidgets
rather than relying on QT_VERSION, which is the version of QtCore.

Reviewed By: drosca
Differential Revision: https://phabricator.kde.org/D12833
CCBUG: 391300
This commit is contained in:
Kevin Kofler 2018-05-12 03:15:56 +02:00
parent 4bf77cd4d1
commit d06a0d60e0
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -85,6 +85,8 @@ if (WIN32)
add_definitions(-D_WIN32_WINNT=${ver}) add_definitions(-D_WIN32_WINNT=${ver})
endif() endif()
set(HAVE_QTWEBENGINE_5_10 NOT Qt5WebEngineWidgets_VERSION VERSION_LESS 5.10.0)
# Mandatory: OpenSSL # Mandatory: OpenSSL
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)

3
config.h.cmake
View File

@ -9,3 +9,6 @@
/* Disable DBus support */ /* Disable DBus support */
#cmakedefine DISABLE_DBUS #cmakedefine DISABLE_DBUS
/* QtWebEngine is at least version 5.10 */
#cmakedefine01 HAVE_QTWEBENGINE_5_10

2
src/lib/webengine/webview.cpp
View File

@ -495,7 +495,7 @@ void WebView::copyLinkToClipboard()
void WebView::savePageAs() void WebView::savePageAs()
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) #if HAVE_QTWEBENGINE_5_10
page()->runJavaScript(QSL("document.contentType"), WebPage::SafeJsWorld, [this](const QVariant &res) { page()->runJavaScript(QSL("document.contentType"), WebPage::SafeJsWorld, [this](const QVariant &res) {
const QSet<QString> webPageTypes = { const QSet<QString> webPageTypes = {
QSL("text/html"), QSL("text/html"),