optional-qtwebengine-03-e312031105bd66e0f67cba3a199445cdd9b87939

commit e312031105bd66e0f67cba3a199445cdd9b87939
Author: Nathan Ho <nathan@snappizz.com>
Date:   Sun Jun 2 01:43:33 2019 -0700

    sclang: Fix build with QT_WEBENGINE off

Gbp-Pq: Name optional-qtwebengine-03-e312031105bd66e0f67cba3a199445cdd9b87939

diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
index 31447a42e278550ef47b709124e8630b8e9f066d..1e4f78eab3afc75b00ad9c38dcc0a4cd8e8c643e 100644 (file)
--- a/QtCollider/CMakeLists.txt
+++ b/QtCollider/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(REQUIRED_QT_VERSION 5.7)
-set(QT_WEBENGINE TRUE)
+set(QT_WEBENGINE FALSE)
 
 set( QT_USE_QTWEBENGINE TRUE ) # TODO: figure out what to do with this
 

diff --git a/QtCollider/factories.cpp b/QtCollider/factories.cpp
index 118a9ef9c73f09abee5f4612601182d9803d4144..a5a667ac38888cc0250d09c0eb726098256fe8c0 100644 (file)
--- a/QtCollider/factories.cpp
+++ b/QtCollider/factories.cpp
@@ -59,7 +59,6 @@ static void doLoadFactories() {
     QC_ADD_FACTORY(QcAction);
     QC_ADD_FACTORY(QcWidgetAction);
     QC_ADD_FACTORY(QcCallback);
-    QC_ADD_FACTORY(WebView);
     QC_ADD_FACTORY(QcWindow);
     QC_ADD_FACTORY(QcScrollWindow);
     QC_ADD_FACTORY(QcHBoxLayout);
@@ -67,6 +66,9 @@ static void doLoadFactories() {
     QC_ADD_FACTORY(QcGridLayout);
     QC_ADD_FACTORY(QcStackLayout);
     QC_ADD_FACTORY(QtDownload);
+#ifdef QT_WEBENGINE
+    QC_ADD_FACTORY(WebView);
+#endif
 #ifdef __APPLE__
     QC_ADD_FACTORY(QcQuartzComposerView);
 #endif

diff --git a/QtCollider/interface.cpp b/QtCollider/interface.cpp
index 316d1269d13f48d22d8df44821c139158e6571dd..941d5132d1191f69ca97c3c62980beb2cb11e5f5 100644 (file)
--- a/QtCollider/interface.cpp
+++ b/QtCollider/interface.cpp
@@ -29,7 +29,10 @@
 #include <QTimer>
 #include <QEventLoop>
 #include <QDir>
-#include <QWebEngineSettings>
+
+#ifdef QT_WEBENGINE
+#    include <QWebEngineSettings>
+#endif
 
 #ifdef Q_WS_X11
 # include <X11/Xlib.h>
@@ -79,8 +82,10 @@ void QtCollider::init() {
 
         gSystemPalette = qcApp->palette();
 
+#ifdef QT_WEBENGINE
         // Enable javascript localStorage for WebViews
         QWebEngineSettings::globalSettings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, true);
+#endif
 
         // NOTE: Qt may tamper with the C language locale, affecting POSIX number-string conversions.
         // Revert the locale to default:

diff --git a/QtCollider/primitives/prim_misc.cpp b/QtCollider/primitives/prim_misc.cpp
index cd6a2c2cc5798566b8af13cf3056f9907eb76e8e..07b8ec2e8db429ebc03e03f6d84138d53620d2b3 100644 (file)
--- a/QtCollider/primitives/prim_misc.cpp
+++ b/QtCollider/primitives/prim_misc.cpp
@@ -25,8 +25,8 @@
 #include "../type_codec.hpp"
 #include "../QcApplication.h"
 #include "../QObjectProxy.h"
-#include "../widgets/QcWebView.h"
 #include "../style/style.hpp"
+#include "../QcCallback.hpp"
 #include "QtCollider.h"
 
 #ifdef Q_OS_MAC
@@ -41,7 +41,6 @@
 #include <QFontMetrics>
 #include <QDesktopWidget>
 #include <QStyleFactory>
-#include <QWebEngineSettings>
 #include <QCursor>
 
 namespace QtCollider {

diff --git a/QtCollider/style/ProxyStyle.cpp b/QtCollider/style/ProxyStyle.cpp
index 719aa5f786036f67a2807bc04a0acd877361a226..a1d68830f7d88ccd999b4de11a2a996d999a7cda 100644 (file)
--- a/QtCollider/style/ProxyStyle.cpp
+++ b/QtCollider/style/ProxyStyle.cpp
@@ -3,10 +3,13 @@
 #include "../QcApplication.h"
 
 #include <QtGlobal>
-#include <QWebEngineView>
 #include <QStyleOptionSlider>
 #include <QPainter>
 
+#ifdef QT_WEBENGINE
+#    include <QWebEngineView>
+#endif
+
 #ifdef Q_OS_MAC
 #    include "../hacks/hacks_mac.hpp"
 #endif
@@ -30,6 +33,7 @@ static bool AlwaysShowScrollbars() {
 
 void ProxyStyle::drawComplexControl(ComplexControl ctrl, const QStyleOptionComplex* opt, QPainter* p,
                                     const QWidget* w) const {
+#ifdef QT_WEBENGINE
     // FIXME: this is a workaround for the WebKit bug #104116 (or a variation on it).
     if (ctrl == QStyle::CC_ScrollBar && qobject_cast<const QWebEngineView*>(w) != 0
         && opt->type == QStyleOption::SO_Slider) {
@@ -41,6 +45,7 @@ void ProxyStyle::drawComplexControl(ComplexControl ctrl, const QStyleOptionCompl
         QProxyStyle::drawComplexControl(ctrl, &opt2, p, w);
         return;
     }
+#endif // QT_WEBENGINE
 
     if (ctrl == QStyle::CC_ScrollBar && AlwaysShowScrollbars()) {
         const QStyleOptionSlider* optSlider = static_cast<const QStyleOptionSlider*>(opt);