commit 7c3305d45cba46096c01ea9f7e8232436c1d3271
Author: Nathan Ho <nathan@snappizz.com>
Date:   Sat Jun 8 15:19:17 2019 -0700

    Change SC_USE_WEBENGINE to SC_USE_QTWEBENGINE

Index: supercollider-3.10.0+repack/HelpSource/Classes/HelpBrowser.schelp
===================================================================
--- supercollider-3.10.0+repack.orig/HelpSource/Classes/HelpBrowser.schelp
+++ supercollider-3.10.0+repack/HelpSource/Classes/HelpBrowser.schelp
@@ -9,7 +9,7 @@ HelpBrowser is the GUI help browser that
 
 Note that this is not the same as the help browser built into the IDE.
 
-Since the Qt WebEngine dependency is hefty and difficult to install on some systems, it is possible for sclang to have been built without WebView support (using the CMake flag code:: -DSC_USE_WEBENGINE=OFF :: at compile). If so, attempting to invoke this class will throw an error.
+Since the Qt WebEngine dependency is hefty and difficult to install on some systems, it is possible for sclang to have been built without WebView support (using the CMake flag code:: -DSC_USE_QTWEBENGINE=OFF :: at compile). If so, attempting to invoke this class will throw an error.
 
 classmethods::
 private:: getOldWrapUrl, initClass
Index: supercollider-3.10.0+repack/HelpSource/Classes/WebView.schelp
===================================================================
--- supercollider-3.10.0+repack.orig/HelpSource/Classes/WebView.schelp
+++ supercollider-3.10.0+repack/HelpSource/Classes/WebView.schelp
@@ -6,7 +6,7 @@ DESCRIPTION::
 
 WebView displays web pages and provides all the standard browsing functionality.
 
-Since the Qt WebEngine dependency is hefty and difficult to install on some systems, it is possible for sclang to have been built without WebView support (using the CMake flag code:: -DSC_USE_WEBENGINE=OFF :: at compile). If so, attempting to invoke this class will throw an error.
+Since the Qt WebEngine dependency is hefty and difficult to install on some systems, it is possible for sclang to have been built without WebView support (using the CMake flag code:: -DSC_USE_QTWEBENGINE=OFF :: at compile). If so, attempting to invoke this class will throw an error.
 
 CLASSMETHODS::
 
Index: supercollider-3.10.0+repack/QtCollider/CMakeLists.txt
===================================================================
--- supercollider-3.10.0+repack.orig/QtCollider/CMakeLists.txt
+++ supercollider-3.10.0+repack/QtCollider/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(REQUIRED_QT_VERSION 5.7)
-option(SC_USE_WEBENGINE "Build with Qt WebEngine." ON)
+option(SC_USE_QTWEBENGINE "Build with Qt WebEngine." ON)
 
 ###############################################################################
 # Components and libraries
@@ -22,7 +22,7 @@ set (QT_COLLIDER_LIBS
   Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
   ${MATH_LIBRARY})
 
-if(SC_USE_WEBENGINE)
+if(SC_USE_QTWEBENGINE)
   list(APPEND QT_COMPONENTS WebEngine WebEngineCore WebEngineWidgets)
   list(APPEND QT_COLLIDER_LIBS Qt5::WebEngineCore Qt5::WebEngineWidgets)
 endif()
@@ -151,7 +151,7 @@ set(QT_COLLIDER_WEBENGINE_HDRS
   ${QT_COLLIDER_DIR}/widgets/web_page.hpp
 )
 
-if(SC_USE_WEBENGINE)
+if(SC_USE_QTWEBENGINE)
   list(APPEND QT_COLLIDER_HDRS ${QT_COLLIDER_WEBENGINE_HDRS})
 endif()
 
Index: supercollider-3.10.0+repack/QtCollider/factories.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/QtCollider/factories.cpp
+++ supercollider-3.10.0+repack/QtCollider/factories.cpp
@@ -66,7 +66,7 @@ static void doLoadFactories() {
     QC_ADD_FACTORY(QcGridLayout);
     QC_ADD_FACTORY(QcStackLayout);
     QC_ADD_FACTORY(QtDownload);
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     QC_ADD_FACTORY(WebView);
 #endif
 #ifdef __APPLE__
Index: supercollider-3.10.0+repack/QtCollider/interface.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/QtCollider/interface.cpp
+++ supercollider-3.10.0+repack/QtCollider/interface.cpp
@@ -30,7 +30,7 @@
 #include <QEventLoop>
 #include <QDir>
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 #    include <QWebEngineSettings>
 #endif
 
@@ -82,7 +82,7 @@ void QtCollider::init() {
 
         gSystemPalette = qcApp->palette();
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
         // Enable javascript localStorage for WebViews
         QWebEngineSettings::globalSettings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, true);
 #endif
Index: supercollider-3.10.0+repack/QtCollider/style/ProxyStyle.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/QtCollider/style/ProxyStyle.cpp
+++ supercollider-3.10.0+repack/QtCollider/style/ProxyStyle.cpp
@@ -6,7 +6,7 @@
 #include <QStyleOptionSlider>
 #include <QPainter>
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 #    include <QWebEngineView>
 #endif
 
@@ -33,7 +33,7 @@ static bool AlwaysShowScrollbars() {
 
 void ProxyStyle::drawComplexControl(ComplexControl ctrl, const QStyleOptionComplex* opt, QPainter* p,
                                     const QWidget* w) const {
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     // 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) {
@@ -45,7 +45,7 @@ void ProxyStyle::drawComplexControl(Comp
         QProxyStyle::drawComplexControl(ctrl, &opt2, p, w);
         return;
     }
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
     if (ctrl == QStyle::CC_ScrollBar && AlwaysShowScrollbars()) {
         const QStyleOptionSlider* optSlider = static_cast<const QStyleOptionSlider*>(opt);
Index: supercollider-3.10.0+repack/QtCollider/widgets/QcWebView.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/QtCollider/widgets/QcWebView.cpp
+++ supercollider-3.10.0+repack/QtCollider/widgets/QcWebView.cpp
@@ -19,7 +19,7 @@
 *
 ************************************************************************/
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 
 #    include "QcWebView.h"
 #    include "../widgets/web_page.hpp"
@@ -324,4 +324,4 @@ void WebView::onLinkClicked(const QUrl &
 
 } // namespace QtCollider
 
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
Index: supercollider-3.10.0+repack/QtCollider/widgets/web_page.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/QtCollider/widgets/web_page.cpp
+++ supercollider-3.10.0+repack/QtCollider/widgets/web_page.cpp
@@ -19,7 +19,7 @@
 *
 ************************************************************************/
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 
 #    include "web_page.hpp"
 
@@ -63,4 +63,4 @@ bool WebPage::acceptNavigationRequest(co
 
 } // namespace QtCollider
 
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
Index: supercollider-3.10.0+repack/editors/sc-ide/CMakeLists.txt
===================================================================
--- supercollider-3.10.0+repack.orig/editors/sc-ide/CMakeLists.txt
+++ supercollider-3.10.0+repack/editors/sc-ide/CMakeLists.txt
@@ -24,7 +24,7 @@ set(QT_IDE_LIBRARIES
     Qt5::Sql
 )
 
-if(SC_USE_WEBENGINE)
+if(SC_USE_QTWEBENGINE)
     list(APPEND QT_IDE_COMPONENTS
         WebChannel
         WebEngine
@@ -200,7 +200,7 @@ set(ide_webengine_src
     ${CMAKE_SOURCE_DIR}/QtCollider/widgets/web_page.cpp
 )
 
-if(SC_USE_WEBENGINE)
+if(SC_USE_QTWEBENGINE)
     list(APPEND ide_moc_hdr ${ide_webengine_moc_hdrs})
     list(APPEND ide_src ${ide_webengine_src})
 endif()
@@ -354,9 +354,9 @@ if(LTO)
                  APPEND PROPERTY LINK_FLAGS "-flto -flto-report -fwhole-program")
 endif()
 
-if(SC_USE_WEBENGINE)
+if(SC_USE_QTWEBENGINE)
     message(STATUS "IDE: Building with QtWebEngine")
-    target_compile_definitions(SuperCollider PUBLIC SC_USE_WEBENGINE)
+    target_compile_definitions(SuperCollider PUBLIC SC_USE_QTWEBENGINE)
 endif()
 
 # Installation
Index: supercollider-3.10.0+repack/editors/sc-ide/core/main.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/editors/sc-ide/core/main.cpp
+++ supercollider-3.10.0+repack/editors/sc-ide/core/main.cpp
@@ -43,12 +43,12 @@
 #include <QDebug>
 #include <QStyleFactory>
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 #    include <QWebChannel>
 #    include "../widgets/util/WebSocketClientWrapper.hpp"
 #    include "../widgets/util/WebSocketTransport.hpp"
 #    include "../widgets/util/IDEWebChannelWrapper.hpp"
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
 using namespace ScIDE;
 
@@ -137,7 +137,7 @@ int main( int argc, char *argv[] )
     if (startInterpreter)
         main->scProcess()->startLanguage();
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     // setup HelpBrowser server
     QWebSocketServer server("SCIDE HelpBrowser Server", QWebSocketServer::NonSecureMode);
     if (!server.listen(QHostAddress::LocalHost, 12344)) {
@@ -153,7 +153,7 @@ int main( int argc, char *argv[] )
     // publish IDE interface
     IDEWebChannelWrapper ideWrapper { win->helpBrowserDocklet()->browser() };
     channel.registerObject("IDE", &ideWrapper);
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
     return app.exec();
 }
@@ -314,7 +314,7 @@ bool Main::nativeEventFilter(const QByte
 }
 
 bool Main::openDocumentation(const QString& string) {
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     QString symbol = string.trimmed();
     if (symbol.isEmpty())
         return false;
@@ -323,20 +323,20 @@ bool Main::openDocumentation(const QStri
     helpDock->browser()->gotoHelpFor(symbol);
     helpDock->focus();
     return true;
-#else // SC_USE_WEBENGINE
+#else // SC_USE_QTWEBENGINE
     return false;
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 }
 
 bool Main::openDocumentationForMethod(const QString& className, const QString& methodName) {
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     HelpBrowserDocklet* helpDock = MainWindow::instance()->helpBrowserDocklet();
     helpDock->browser()->gotoHelpForMethod(className, methodName);
     helpDock->focus();
     return true;
-#else // SC_USE_WEBENGINE
+#else // SC_USE_QTWEBENGINE
     return false;
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 }
 
 void Main::openDefinition(const QString& string, QWidget* parent) {
Index: supercollider-3.10.0+repack/editors/sc-ide/widgets/code_editor/autocompleter.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/editors/sc-ide/widgets/code_editor/autocompleter.cpp
+++ supercollider-3.10.0+repack/editors/sc-ide/widgets/code_editor/autocompleter.cpp
@@ -29,9 +29,9 @@
 #include "../../core/util/standard_dirs.hpp"
 #include "../main_window.hpp"
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 #    include "../help_browser.hpp"
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
 #include <yaml-cpp/node/node.h>
 #include <yaml-cpp/parser.h>
@@ -1310,11 +1310,11 @@ void AutoCompleter::parseClassNode(DocNo
 }
 
 void AutoCompleter::gotoHelp(QString symbol) {
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     HelpBrowserDocklet* helpDock = MainWindow::instance()->helpBrowserDocklet();
     helpDock->browser()->gotoHelpFor(symbol);
     helpDock->focus();
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 }
 
 } // namespace ScIDE
Index: supercollider-3.10.0+repack/editors/sc-ide/widgets/code_editor/sc_editor.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/editors/sc-ide/widgets/code_editor/sc_editor.cpp
+++ supercollider-3.10.0+repack/editors/sc-ide/widgets/code_editor/sc_editor.cpp
@@ -28,9 +28,9 @@
 #include "../../core/settings/manager.hpp"
 #include "../../core/settings/theme.hpp"
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 #    include "help_browser.hpp"
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
 #include "QtCollider/hacks/hacks_qt.hpp"
 
@@ -1319,13 +1319,13 @@ void ScCodeEditor::evaluateLine()
 {
     QString text;
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     HelpBrowserDocklet* help = MainWindow::instance()->helpBrowserDocklet();
     if (help && help->browser()->helpBrowserHasFocus()) {
         help->browser()->evaluateSelection(false);
         return; // early return
     }
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
     // Try current selection
     QTextCursor cursor = textCursor();
@@ -1360,13 +1360,13 @@ void ScCodeEditor::evaluateRegion()
 {
     QString text;
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     HelpBrowserDocklet* help = MainWindow::instance()->helpBrowserDocklet();
     if (help && help->browser()->helpBrowserHasFocus()) {
         help->browser()->evaluateSelection(true);
         return; // early return
     }
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
     // Try current selection
     QTextCursor cursor = textCursor();
Index: supercollider-3.10.0+repack/editors/sc-ide/widgets/help_browser.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/editors/sc-ide/widgets/help_browser.cpp
+++ supercollider-3.10.0+repack/editors/sc-ide/widgets/help_browser.cpp
@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 
 #    define QT_NO_DEBUG_OUTPUT
 
@@ -527,4 +527,4 @@ HelpBrowserDocklet::HelpBrowserDocklet(
 
 } // namespace ScIDE
 
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
Index: supercollider-3.10.0+repack/editors/sc-ide/widgets/main_window.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/editors/sc-ide/widgets/main_window.cpp
+++ supercollider-3.10.0+repack/editors/sc-ide/widgets/main_window.cpp
@@ -43,9 +43,9 @@
 #include "code_editor/sc_editor.hpp"
 #include "settings/dialog.hpp"
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 #    include "help_browser.hpp"
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
 #include "QtCollider/hacks/hacks_qt.hpp"
 
@@ -146,12 +146,12 @@ MainWindow::MainWindow(Main * main) :
     addDockWidget(Qt::LeftDockWidgetArea, mDocumentsDocklet->dockWidget());
     mDocumentsDocklet->hide();
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     mHelpBrowserDocklet = new HelpBrowserDocklet(this);
     mHelpBrowserDocklet->setObjectName("help-dock");
     addDockWidget(Qt::RightDockWidgetArea, mHelpBrowserDocklet->dockWidget());
     // mHelpBrowserDockable->hide();
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
     mPostDocklet = new PostDocklet(this);
     mPostDocklet->setObjectName("post-dock");
@@ -486,12 +486,12 @@ void MainWindow::createActions()
     action->setStatusTip(tr("Show/hide Documents docklet"));
     settings->addAction(mDocumentsDocklet->toggleViewAction(), "ide-docklet-documents", ideCategory);
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     action = mHelpBrowserDocklet->toggleViewAction();
     action->setIcon(QIcon::fromTheme("system-help"));
     action->setStatusTip(tr("Show/hide Help browser docklet"));
     settings->addAction(mHelpBrowserDocklet->toggleViewAction(), "ide-docklet-help", ideCategory);
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
     // In Mac OS, all menu item shortcuts need a modifier, so add the action with
     // the "Escape" default shortcut to the main window widget.
@@ -508,14 +508,14 @@ void MainWindow::createActions()
     mPostDocklet->widget()->addAction(mActions[LookupReferences]);
     mPostDocklet->widget()->addAction(mActions[LookupReferencesForCursor]);
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     mHelpBrowserDocklet->widget()->addAction(mActions[LookupDocumentation]);
     mHelpBrowserDocklet->widget()->addAction(mActions[LookupDocumentationForCursor]);
     mHelpBrowserDocklet->widget()->addAction(mActions[LookupImplementation]);
     mHelpBrowserDocklet->widget()->addAction(mActions[LookupImplementationForCursor]);
     mHelpBrowserDocklet->widget()->addAction(mActions[LookupReferences]);
     mHelpBrowserDocklet->widget()->addAction(mActions[LookupReferencesForCursor]);
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 }
 
 void MainWindow::createMenus() {
@@ -593,9 +593,9 @@ void MainWindow::createMenus() {
     submenu = new QMenu(tr("&Docklets"), this);
     submenu->addAction(mPostDocklet->toggleViewAction());
     submenu->addAction(mDocumentsDocklet->toggleViewAction());
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     submenu->addAction(mHelpBrowserDocklet->toggleViewAction());
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
     menu->addMenu(submenu);
     menu->addSeparator();
     submenu = menu->addMenu(tr("&Tool Panels"));
@@ -672,12 +672,12 @@ void MainWindow::createMenus() {
     menu = new QMenu(tr("&Help"), this);
     menu->addAction(mActions[HelpAboutIDE]);
     menu->addAction(mActions[ReportABug]);
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     menu->addSeparator();
     menu->addAction(mActions[Help]);
     menu->addAction(mActions[LookupDocumentationForCursor]);
     menu->addAction(mActions[LookupDocumentation]);
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
     menu->addSeparator();
     menu->addAction(mActions[ShowAbout]);
     menu->addAction(mActions[ShowAboutQT]);
@@ -693,9 +693,9 @@ template <class T> void MainWindow::save
     QVariantMap detachedData;
     saveDetachedState(mPostDocklet, detachedData);
     saveDetachedState(mDocumentsDocklet, detachedData);
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     saveDetachedState(mHelpBrowserDocklet, detachedData);
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
     settings->beginGroup("mainWindow");
     settings->setValue("geometry", this->saveGeometry().toBase64());
@@ -742,9 +742,9 @@ void MainWindow::restoreWindowState( T *
 
     restoreDetachedState(mPostDocklet, detachedData);
     restoreDetachedState(mDocumentsDocklet, detachedData);
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     restoreDetachedState(mHelpBrowserDocklet, detachedData);
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
     qDebug("restoring state");
 
@@ -1397,9 +1397,9 @@ void MainWindow::applySettings(Settings:
     applyCursorBlinkingSettings(settings);
 
     mPostDocklet->mPostWindow->applySettings(settings);
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     mHelpBrowserDocklet->browser()->applySettings(settings);
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
     mCmdLine->applySettings(settings);
 }
 
@@ -1575,18 +1575,18 @@ void MainWindow::lookupDocumentationForC
 }
 
 void MainWindow::openHelp() {
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     if (mHelpBrowserDocklet->browser()->url().isEmpty())
         mHelpBrowserDocklet->browser()->goHome();
     mHelpBrowserDocklet->focus();
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 }
 
 void MainWindow::openHelpAboutIDE() {
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     mHelpBrowserDocklet->browser()->gotoHelpFor("Guides/SCIde");
     mHelpBrowserDocklet->focus();
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 }
 
 void MainWindow::doBugReport() {
Index: supercollider-3.10.0+repack/editors/sc-ide/widgets/main_window.hpp
===================================================================
--- supercollider-3.10.0+repack.orig/editors/sc-ide/widgets/main_window.hpp
+++ supercollider-3.10.0+repack/editors/sc-ide/widgets/main_window.hpp
@@ -120,7 +120,7 @@ public:
     void focusCodeEditor();
     bool promptSaveDocs();
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     HelpBrowserDocklet* helpBrowserDocklet() { return mHelpBrowserDocklet; }
 #endif
     PostDocklet* postDocklet() { return mPostDocklet; }
@@ -239,7 +239,7 @@ private:
     // Docks
     PostDocklet* mPostDocklet;
     DocumentsDocklet* mDocumentsDocklet;
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     HelpBrowserDocklet* mHelpBrowserDocklet;
 #endif
 
Index: supercollider-3.10.0+repack/editors/sc-ide/widgets/style/style.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/editors/sc-ide/widgets/style/style.cpp
+++ supercollider-3.10.0+repack/editors/sc-ide/widgets/style/style.cpp
@@ -33,9 +33,9 @@
 #include <QLayout>
 #include <QDebug>
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 #    include <QWebEngineView>
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
 
 namespace ScIDE {
 
@@ -74,7 +74,7 @@ void Style::drawComplexControl(ComplexCo
     }
 
     switch (control) {
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
     // 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) {
@@ -87,7 +87,7 @@ void Style::drawComplexControl(ComplexCo
             return;
         }
     }
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
     case QStyle::CC_ToolButton: {
         // TODO: We only draw either text, or icon, or arrow
 
Index: supercollider-3.10.0+repack/editors/sc-ide/widgets/util/WebSocketTransport.cpp
===================================================================
--- supercollider-3.10.0+repack.orig/editors/sc-ide/widgets/util/WebSocketTransport.cpp
+++ supercollider-3.10.0+repack/editors/sc-ide/widgets/util/WebSocketTransport.cpp
@@ -48,7 +48,7 @@
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifdef SC_USE_WEBENGINE
+#ifdef SC_USE_QTWEBENGINE
 
 #    include "WebSocketTransport.hpp"
 
@@ -88,4 +88,4 @@ void WebSocketTransport::textMessageRece
 
 } // namespace ScIDE
 
-#endif // SC_USE_WEBENGINE
+#endif // SC_USE_QTWEBENGINE
Index: supercollider-3.10.0+repack/lang/CMakeLists.txt
===================================================================
--- supercollider-3.10.0+repack.orig/lang/CMakeLists.txt
+++ supercollider-3.10.0+repack/lang/CMakeLists.txt
@@ -182,9 +182,9 @@ if(SC_QT OR SC_IDE)
 	message(STATUS "Found Qt: " ${QtCore_location} )
     get_filename_component(QT_BIN_PATH ${QtCore_location} DIRECTORY CACHE)
 
-  if(SC_USE_WEBENGINE)
+  if(SC_USE_QTWEBENGINE)
     message(STATUS "sclang: Building with QtWebEngine")
-    target_compile_definitions(libsclang PUBLIC SC_USE_WEBENGINE)
+    target_compile_definitions(libsclang PUBLIC SC_USE_QTWEBENGINE)
   endif()
 	target_link_libraries(libsclang ${QT_COLLIDER_LIBS})
 endif()
