Switched to QWebEngineView, so Fuel now requires at least Qt 5.4

FossilOrigin-Name: a4e2ab66866278039d31a13f7ef0ca774bea9cfb

fuel.pro

@@ -2,13 +2,21 @@
 # Fuel
 #-------------------------------------------------
 
-QT    = core gui webkit
-
-contains(QT_VERSION, ^5\\..*) {
-	QT += widgets webkitwidgets
-	QT -= quick multimediawidgets opengl printsupport qml multimedia positioning sensors
+lessThan(QT_MAJOR_VERSION, 5) {
+	message("Unsupported Qt version $${QT_VERSION}.")
+	error("Fuel requires Qt 5.4.0 or greater")
 }
 
+# Fuel requires at least Qt 5.4 due to QtWebEngine
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+	message("Unsupported Qt version $${QT_VERSION}.")
+	error("Fuel requires Qt 5.4.0 or greater")
+}
+
+QT = core gui widgets webengine webenginewidgets
+QT-= quick multimediawidgets opengl printsupport qml multimedia positioning sensors
+
+
 TARGET = Fuel
 TEMPLATE = app
 

manifest

@@ -1,5 +1,5 @@
-C Updated\sChangeLog\n
-D 2015-10-16T09:43:15.585
+C Switched\sto\sQWebEngineView,\sso\sFuel\snow\srequires\sat\sleast\sQt\s5.4\n\n\n
+D 2018-06-09T17:18:50.060
 F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
@@ -38,7 +38,7 @@ F ext/qtkeychain/qkeychain_export.h d756528188ef9bf3c4461ecc80048f06c362b54b
 F ext/qtkeychain/testclient.cpp cb1290a9584b627306a7bfdf1c02a8bbae503f5f
 F ext/qtkeychain/translations/qtkeychain_de.ts 0a70c8205c066c30ed8172f0670942de1fc5eede
 F ext/qtkeychain/translations/qtkeychain_ro.ts f16939382fd1a047b0692426bc82847347f14b32
-F fuel.pro 4a7c8eeb7491317db76b492ace3d52311462bf38
+F fuel.pro 823820549884c867d5f57b7e8ebb13684e03b2e8
 F intl/convert.bat cd29f0a22e002f84adeda3b310379cc4c5a01651 x
 F intl/convert.sh ac6edc8d99b575601cf9c6b85b18c9e25875b6e0 x
 F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741
@@ -222,8 +222,8 @@ F src/CloneDialog.cpp ca978366d9d5fcdbb21551cd7d7e782fcebd066c
 F src/CloneDialog.h 8813d91f893eb3eb86a4ea5e50f9a53a0ea07047
 F src/CommitDialog.cpp 3d25ae2aa8af0ab417736a3f2d7f95a8dcb7480a
 F src/CommitDialog.h 921bf27c0c538ab9e9d6bdc750064337d346270b
-F src/CustomWebView.cpp b7dd0c41977c2cba005df07ed8967ba6f58d07d9
-F src/CustomWebView.h fbc8ee55812d1acb3c3b2bc31be7533e8a112822
+F src/CustomWebView.cpp 882824b074f56764d6e5729e020e5ea1c63d3fe4
+F src/CustomWebView.h 603d6346dda3ae47c4672d6f29b76663df64c37e
 F src/FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
 F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
 F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
@@ -262,7 +262,7 @@ F ui/MainWindow.ui ad04643d071fe513b46ef413749a493909a90ad1
 F ui/RemoteDialog.ui 424b2d4a3d0162f84fdccf6af02c1cfce07a06f5
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1
-P 16b4d25fe14b5d8a9398db1a31e683382b532473
-R e9bf02eb7abb14d676285c8ede2f0b12
+P b8a962d79a02e8488e38f9d1109356f3e67f3440
+R 2a1fffd5776f58e09d166cd4cf7f2aff
 U Kostas
-Z c74d5e7fe066f3beccf4a0d167b97b61
+Z 03232dfd0b9a222b202384c3fac562c4

manifest.uuid

@@ -1 +1 @@
-b8a962d79a02e8488e38f9d1109356f3e67f3440
+a4e2ab66866278039d31a13f7ef0ca774bea9cfb

src/CustomWebView.cpp

@@ -2,7 +2,7 @@
 #include <QMouseEvent>
 
 CustomWebView::CustomWebView(QWidget *parent) :
-	QWebView(parent)
+	QWebEngineView(parent)
 {
 	setUrl(QUrl("about:blank"));
 }
@@ -15,5 +15,5 @@ void CustomWebView::mousePressEvent(QMouseEvent *event)
 	else if(but == Qt::XButton2)
 		forward();
 	else
-		QWebView::mousePressEvent(event);
+		QWebEngineView::mousePressEvent(event);
 }

src/CustomWebView.h

@@ -1,9 +1,9 @@
 #ifndef CUSTOMWEBVIEW_H
 #define CUSTOMWEBVIEW_H
 
-#include <QWebView>
+#include <QWebEngineView>
 
-class CustomWebView : public QWebView
+class CustomWebView : public QWebEngineView
 {
 	Q_OBJECT
 public: