From dc5117b48006c6a19455403a7d462a8082e6b0a6 Mon Sep 17 00:00:00 2001
From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Mon, 8 Jun 2020 08:17:12 +0100
Subject: [PATCH] 
 optional-qtwebengine-08-48ae2945e02218c0793977f4e90cefc4cd2ac75a

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

    cmake: include all C++ files in target even if no objects


Gbp-Pq: Name optional-qtwebengine-08-48ae2945e02218c0793977f4e90cefc4cd2ac75a
---
 QtCollider/CMakeLists.txt        |  6 ++----
 QtCollider/widgets/QcWebView.cpp | 30 +++++++++++++++++-------------
 QtCollider/widgets/web_page.cpp  | 10 +++++++---
 editors/sc-ide/CMakeLists.txt    |  4 ++++
 lang/CMakeLists.txt              |  2 +-
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
index f409979..f9da30d 100644
--- a/QtCollider/CMakeLists.txt
+++ b/QtCollider/CMakeLists.txt
@@ -125,6 +125,7 @@ set( QT_COLLIDER_SRCS
   ${QT_COLLIDER_DIR}/widgets/QcScope.cpp
   ${QT_COLLIDER_DIR}/widgets/QcScopeShm.cpp
   ${QT_COLLIDER_DIR}/widgets/QcLevelIndicator.cpp
+  ${QT_COLLIDER_DIR}/widgets/QcWebView.cpp
   ${QT_COLLIDER_DIR}/widgets/QcWindow.cpp
   ${QT_COLLIDER_DIR}/widgets/QcGraph.cpp
   ${QT_COLLIDER_DIR}/widgets/QcCanvas.cpp
@@ -133,6 +134,7 @@ set( QT_COLLIDER_SRCS
   ${QT_COLLIDER_DIR}/widgets/soundfileview/cachestream.cpp
   ${QT_COLLIDER_DIR}/widgets/QcFileDialog.cpp
   ${QT_COLLIDER_DIR}/widgets/QcPenPrinter.cpp
+  ${QT_COLLIDER_DIR}/widgets/web_page.cpp
   ${QT_COLLIDER_DIR}/layouts/layouts.cpp
   ${QT_COLLIDER_DIR}/layouts/stack_layout.cpp
   ${QT_COLLIDER_DIR}/style/ProxyStyle.cpp
@@ -151,10 +153,6 @@ set(QT_COLLIDER_WEBENGINE_HDRS
 
 if(SC_USE_WEBENGINE)
   list(APPEND QT_COLLIDER_HDRS ${QT_COLLIDER_WEBENGINE_HDRS})
-  list(APPEND QT_COLLIDER_SRCS
-    ${QT_COLLIDER_DIR}/widgets/QcWebView.cpp
-    ${QT_COLLIDER_DIR}/widgets/web_page.cpp
-  )
 endif()
 
 ###############################################################################
diff --git a/QtCollider/widgets/QcWebView.cpp b/QtCollider/widgets/QcWebView.cpp
index b176ab7..be781a6 100644
--- a/QtCollider/widgets/QcWebView.cpp
+++ b/QtCollider/widgets/QcWebView.cpp
@@ -19,19 +19,21 @@
 *
 ************************************************************************/
 
-#include "QcWebView.h"
-#include "../widgets/web_page.hpp"
-#include "../QcWidgetFactory.h"
-#include <QWebEnginePage>
-#include <QWebEngineSettings>
-#include <QWebEngineContextMenuData>
-#include <QAction>
-#include <QMenu>
-#include <QShortcut>
-#include <QKeyEvent>
-#include <QApplication>
-#include <QStyle>
-#include <QWebEngineCallback>
+#ifdef SC_USE_WEBENGINE
+
+#    include "QcWebView.h"
+#    include "../widgets/web_page.hpp"
+#    include "../QcWidgetFactory.h"
+#    include <QWebEnginePage>
+#    include <QWebEngineSettings>
+#    include <QWebEngineContextMenuData>
+#    include <QAction>
+#    include <QMenu>
+#    include <QShortcut>
+#    include <QKeyEvent>
+#    include <QApplication>
+#    include <QStyle>
+#    include <QWebEngineCallback>
 
 QC_DECLARE_QWIDGET_FACTORY(WebView);
 
@@ -321,3 +323,5 @@ void WebView::onLinkClicked(const QUrl &url, QWebEnginePage::NavigationType type
 }
 
 } // namespace QtCollider
+
+#endif // SC_USE_WEBENGINE
diff --git a/QtCollider/widgets/web_page.cpp b/QtCollider/widgets/web_page.cpp
index b466e21..1dbb14f 100644
--- a/QtCollider/widgets/web_page.cpp
+++ b/QtCollider/widgets/web_page.cpp
@@ -19,10 +19,12 @@
 *
 ************************************************************************/
 
-#include "web_page.hpp"
+#ifdef SC_USE_WEBENGINE
 
-#include <QApplication>
-#include <QClipboard>
+#    include "web_page.hpp"
+
+#    include <QApplication>
+#    include <QClipboard>
 
 namespace QtCollider {
 
@@ -60,3 +62,5 @@ bool WebPage::acceptNavigationRequest(const QUrl& url, QWebEnginePage::Navigatio
 }
 
 } // namespace QtCollider
+
+#endif // SC_USE_WEBENGINE
diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
index 50059bc..25c39a9 100644
--- a/editors/sc-ide/CMakeLists.txt
+++ b/editors/sc-ide/CMakeLists.txt
@@ -337,6 +337,10 @@ if(LTO)
                  APPEND PROPERTY LINK_FLAGS "-flto -flto-report -fwhole-program")
 endif()
 
+if(SC_USE_WEBENGINE)
+    message(STATUS "IDE: Building with QtWebEngine")
+    target_compile_definitions(SuperCollider PUBLIC SC_USE_WEBENGINE)
+endif()
 
 # Installation
 
diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 05cd992..879e0e6 100644
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -183,7 +183,7 @@ if(SC_QT OR SC_IDE)
     get_filename_component(QT_BIN_PATH ${QtCore_location} DIRECTORY CACHE)
 
   if(SC_USE_WEBENGINE)
-    message(STATUS "Building with QtWebEngine")
+    message(STATUS "sclang: Building with QtWebEngine")
     target_compile_definitions(libsclang PUBLIC SC_USE_WEBENGINE)
   endif()
 	target_link_libraries(libsclang ${QT_COLLIDER_LIBS})
-- 
2.30.2