optional-qtwebengine-11-6c83b58ee7a5c621bb71c481fadccf103f63b9c0

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

    scide: Remove some Qt components if SC_USE_WEBENGINE is off

Gbp-Pq: Name optional-qtwebengine-11-6c83b58ee7a5c621bb71c481fadccf103f63b9c0

diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
index 29b964c89e34b1b0d3655d59cb558d0e87eaef55..d028640ab5afb5621fa987af4f31ce957e9c0173 100644 (file)
--- a/editors/sc-ide/CMakeLists.txt
+++ b/editors/sc-ide/CMakeLists.txt
@@ -2,9 +2,7 @@
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-find_package(
-    Qt5 ${REQUIRED_QT_VERSION}
-    COMPONENTS
+set(QT_IDE_COMPONENTS
     Concurrent
     Core
     LinguistTools
@@ -13,12 +11,7 @@ find_package(
     Qml
     Quick
     Sql
-    WebChannel
-    WebEngine
-    WebEngineWidgets
-    WebSockets
     Widgets
-    REQUIRED
 )
 
 set(QT_IDE_LIBRARIES
@@ -29,9 +22,27 @@ set(QT_IDE_LIBRARIES
     Qt5::Qml
     Qt5::Quick
     Qt5::Sql
-    Qt5::WebChannel
-    Qt5::WebEngineWidgets
-    Qt5::WebSockets
+)
+
+if(SC_USE_WEBENGINE)
+    list(APPEND QT_IDE_COMPONENTS
+        WebChannel
+        WebEngine
+        WebEngineWidgets
+        WebSockets
+    )
+    list(APPEND QT_IDE_LIBRARIES
+        Qt5::WebChannel
+        Qt5::WebEngineWidgets
+        Qt5::WebSockets
+    )
+endif()
+
+find_package(
+    Qt5 ${REQUIRED_QT_VERSION}
+    COMPONENTS
+    ${QT_IDE_COMPONENTS}
+    REQUIRED
 )
 
 if(${CMAKE_COMPILER_IS_GNUCXX})

diff --git a/editors/sc-ide/core/main.cpp b/editors/sc-ide/core/main.cpp
index e8833dbcc21ffa42263ff7e55ec36d1f96257132..d45792a123f9709fdde5ea24a033de2c1d9d48cb 100644 (file)
--- a/editors/sc-ide/core/main.cpp
+++ b/editors/sc-ide/core/main.cpp
@@ -23,13 +23,9 @@
 #include "session_manager.hpp"
 #include "util/standard_dirs.hpp"
 #include "../widgets/main_window.hpp"
-#include "../widgets/help_browser.hpp"
 #include "../widgets/lookup_dialog.hpp"
 #include "../widgets/code_editor/highlighter.hpp"
 #include "../widgets/style/style.hpp"
-#include "../widgets/util/WebSocketClientWrapper.hpp"
-#include "../widgets/util/WebSocketTransport.hpp"
-#include "../widgets/util/IDEWebChannelWrapper.hpp"
 #include "../../../QtCollider/hacks/hacks_mac.hpp"
 #include "../primitives/localsocket_utils.hpp"
 
@@ -45,9 +41,15 @@
 #include <QLibraryInfo>
 #include <QTranslator>
 #include <QDebug>
-#include <QWebChannel>
 #include <QStyleFactory>
 
+#ifdef SC_USE_WEBENGINE
+#    include <QWebChannel>
+#    include "../widgets/util/WebSocketClientWrapper.hpp"
+#    include "../widgets/util/WebSocketTransport.hpp"
+#    include "../widgets/util/IDEWebChannelWrapper.hpp"
+#endif // SC_USE_WEBENGINE
+
 using namespace ScIDE;
 
 int main( int argc, char *argv[] )

diff --git a/editors/sc-ide/core/sc_process.cpp b/editors/sc-ide/core/sc_process.cpp
index 6d8fed51e0062841b842143a50d134e17a53228f..a892e913a6c3010467048bf29e1eb160237c64b5 100644 (file)
--- a/editors/sc-ide/core/sc_process.cpp
+++ b/editors/sc-ide/core/sc_process.cpp
@@ -35,8 +35,6 @@
 #include "util/standard_dirs.hpp"
 #include "../primitives/localsocket_utils.hpp"
 
-#include "../widgets/help_browser.hpp"
-
 #include <yaml-cpp/node/node.h>
 #include <yaml-cpp/parser.h>
 

diff --git a/editors/sc-ide/widgets/code_editor/autocompleter.cpp b/editors/sc-ide/widgets/code_editor/autocompleter.cpp
index 4e9b35bba9ce65d498070397b8ae20913937454e..b35e2045da1b27d8cdb9107c889a44a4f51ff5b3 100644 (file)
--- a/editors/sc-ide/widgets/code_editor/autocompleter.cpp
+++ b/editors/sc-ide/widgets/code_editor/autocompleter.cpp
@@ -28,7 +28,10 @@
 #include "../../core/main.hpp"
 #include "../../core/util/standard_dirs.hpp"
 #include "../main_window.hpp"
-#include "../help_browser.hpp"
+
+#ifdef SC_USE_WEBENGINE
+#    include "../help_browser.hpp"
+#endif // SC_USE_WEBENGINE
 
 #include <yaml-cpp/node/node.h>
 #include <yaml-cpp/parser.h>

diff --git a/editors/sc-ide/widgets/code_editor/sc_editor.cpp b/editors/sc-ide/widgets/code_editor/sc_editor.cpp
index 88afeeb91d7dc38849a08402da41c05b997775c6..cebc0c5f17f5ac2bb78d17da8ec5a80f70e74765 100644 (file)
--- a/editors/sc-ide/widgets/code_editor/sc_editor.cpp
+++ b/editors/sc-ide/widgets/code_editor/sc_editor.cpp
@@ -22,20 +22,22 @@
 #include "autocompleter.hpp"
 #include "line_indicator.hpp"
 #include "main_window.hpp"
-#include "help_browser.hpp"
 #include "../util/gui_utilities.hpp"
 #include "../../core/main.hpp"
 #include "../../core/doc_manager.hpp"
 #include "../../core/settings/manager.hpp"
 #include "../../core/settings/theme.hpp"
 
+#ifdef SC_USE_WEBENGINE
+#    include "help_browser.hpp"
+#endif // SC_USE_WEBENGINE
+
 #include "QtCollider/hacks/hacks_qt.hpp"
 
 #include <QKeyEvent>
 #include <QStack>
 #include <QMimeData>
 #include <QUrl>
-#include <QWebEngineView>
 
 namespace ScIDE {
 

diff --git a/editors/sc-ide/widgets/main_window.cpp b/editors/sc-ide/widgets/main_window.cpp
index faf2d8c783da26ef118577f31f432018a794599b..f2834887db54dc5a283d51614026497e40226e2b 100644 (file)
--- a/editors/sc-ide/widgets/main_window.cpp
+++ b/editors/sc-ide/widgets/main_window.cpp
@@ -30,7 +30,6 @@
 #include "multi_editor.hpp"
 #include "popup_text_input.hpp"
 #include "post_window.hpp"
-#include "help_browser.hpp"
 #include "session_switch_dialog.hpp"
 #include "sessions_dialog.hpp"
 #include "tool_box.hpp"
@@ -44,6 +43,10 @@
 #include "code_editor/sc_editor.hpp"
 #include "settings/dialog.hpp"
 
+#ifdef SC_USE_WEBENGINE
+#    include "help_browser.hpp"
+#endif // SC_USE_WEBENGINE
+
 #include "QtCollider/hacks/hacks_qt.hpp"
 
 #include "SC_Version.hpp"

diff --git a/editors/sc-ide/widgets/style/style.cpp b/editors/sc-ide/widgets/style/style.cpp
index 601ae697344a5d003064148f4dab6fbcc5e6d166..d77f53902d270aed999816c5da703f9858deb058 100644 (file)
--- a/editors/sc-ide/widgets/style/style.cpp
+++ b/editors/sc-ide/widgets/style/style.cpp
@@ -32,7 +32,10 @@
 #include <QToolButton>
 #include <QLayout>
 #include <QDebug>
-#include <QWebEngineView>
+
+#ifdef SC_USE_WEBENGINE
+#    include <QWebEngineView>
+#endif // SC_USE_WEBENGINE
 
 namespace ScIDE {
 
@@ -71,6 +74,7 @@ void Style::drawComplexControl(ComplexControl control, const QStyleOptionComplex
     }
 
     switch (control) {
+#ifdef SC_USE_WEBENGINE
     // FIXME: this is a workaround for the WebKit bug #104116 (or a variation on it).
     case QStyle::CC_ScrollBar: {
         if (qobject_cast<const QWebEngineView*>(widget) != 0 && option->type == QStyleOption::SO_Slider) {
@@ -83,6 +87,7 @@ void Style::drawComplexControl(ComplexControl control, const QStyleOptionComplex
             return;
         }
     }
+#endif // SC_USE_WEBENGINE
     case QStyle::CC_ToolButton: {
         // TODO: We only draw either text, or icon, or arrow
 

diff --git a/editors/sc-ide/widgets/util/WebSocketTransport.cpp b/editors/sc-ide/widgets/util/WebSocketTransport.cpp
index fa9ad86dc1f9d70b7cc5b4de1e7f4b71fb00ed59..126e8f557261da5d8f5f74eadf5f7eeca0011ff1 100644 (file)
--- a/editors/sc-ide/widgets/util/WebSocketTransport.cpp
+++ b/editors/sc-ide/widgets/util/WebSocketTransport.cpp
@@ -48,10 +48,12 @@
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "WebSocketTransport.hpp"
+#ifdef SC_USE_WEBENGINE
 
-#include <QJsonDocument>
-#include <QWebSocket>
+#    include "WebSocketTransport.hpp"
+
+#    include <QJsonDocument>
+#    include <QWebSocket>
 
 namespace ScIDE {
 
@@ -85,3 +87,5 @@ void WebSocketTransport::textMessageReceived(const QString &messageData) {
 }
 
 } // namespace ScIDE
+
+#endif // SC_USE_WEBENGINE