From 9f0f688ee8ed7d454713db5418c9a86f80fd5850 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Mon, 14 May 2018 13:53:05 +0200
Subject: [PATCH] Use QTWEBENGINE_VERSION instead of QT_VERSION

Fixes build against separate QtWebEngine releases.
---
 CMakeLists.txt                | 4 +---
 config.h.cmake                | 3 ---
 src/lib/CMakeLists.txt        | 3 +++
 src/lib/app/qzcommon.h        | 1 +
 src/lib/webengine/webview.cpp | 3 +--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3f583c4c..67f675748 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_USE_QSTRINGBUILDER -DQT_NO_CAS
 
 # Mandatory: Qt5
 set(QT_MIN_VERSION "5.9.0")
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network Sql QuickWidgets PrintSupport WebEngineWidgets WebChannel)
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network Sql QuickWidgets PrintSupport WebEngine WebEngineWidgets WebChannel)
 if (BUILD_TESTING)
     find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test)
 endif()
@@ -85,8 +85,6 @@ if (WIN32)
     add_definitions(-D_WIN32_WINNT=${ver})
 endif()
 
-set(HAVE_QTWEBENGINE_5_10 NOT Qt5WebEngineWidgets_VERSION VERSION_LESS 5.10.0)
-
 # Mandatory: OpenSSL
 find_package(OpenSSL REQUIRED)
 
diff --git a/config.h.cmake b/config.h.cmake
index 3cc5d3484..d35648e5b 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -9,6 +9,3 @@
 
 /* Disable DBus support */
 #cmakedefine DISABLE_DBUS
-
-/* QtWebEngine is at least version 5.10 */
-#cmakedefine01 HAVE_QTWEBENGINE_5_10
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 93a831f52..a93c68b9f 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -297,6 +297,9 @@ qt5_add_resources(SRCS
 
 add_library(FalkonPrivate SHARED ${SRCS})
 
+get_property(QT_WEBENGINE_INCLUDE_DIRS TARGET Qt5::WebEngine PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+target_include_directories(FalkonPrivate SYSTEM PUBLIC ${QT_WEBENGINE_INCLUDE_DIRS})
+
 target_link_libraries(FalkonPrivate
     Qt5::Widgets
     Qt5::WebEngineWidgets
diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h
index fe49aff57..a6d008b90 100644
--- a/src/lib/app/qzcommon.h
+++ b/src/lib/app/qzcommon.h
@@ -20,6 +20,7 @@
 
 #include <QDebug>
 #include <QFlags>
+#include <QtWebEngineVersion>
 
 #ifdef FALKON_SHAREDLIBRARY
 #define FALKON_EXPORT Q_DECL_EXPORT
diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp
index 32c288ca3..d514b0937 100644
--- a/src/lib/webengine/webview.cpp
+++ b/src/lib/webengine/webview.cpp
@@ -35,7 +35,6 @@
 #include "scripts.h"
 #include "webhittestresult.h"
 #include "webscrollbarmanager.h"
-#include "../config.h"
 
 #include <iostream>
 
@@ -496,7 +495,7 @@ void WebView::copyLinkToClipboard()
 
 void WebView::savePageAs()
 {
-#if HAVE_QTWEBENGINE_5_10
+#if QTWEBENGINE_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     page()->runJavaScript(QSL("document.contentType"), WebPage::SafeJsWorld, [this](const QVariant &res) {
         const QSet<QString> webPageTypes = {
             QSL("text/html"),