optional-qtwebengine-04-2005e6f18906b092686f8ed0f48b54c67acf01fd

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

    sclang: Connect CMake to QT_WEBENGINE macro

Gbp-Pq: Name optional-qtwebengine-04-2005e6f18906b092686f8ed0f48b54c67acf01fd

diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
index 1e4f78eab3afc75b00ad9c38dcc0a4cd8e8c643e..398fad80a21f40eeae2cb3546b0d1fd673340861 100644 (file)
--- a/QtCollider/CMakeLists.txt
+++ b/QtCollider/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(REQUIRED_QT_VERSION 5.7)
-set(QT_WEBENGINE FALSE)
-
-set( QT_USE_QTWEBENGINE TRUE ) # TODO: figure out what to do with this
+option(QT_WEBENGINE "Build with Qt WebEngine." ON)
 
 ###############################################################################
 # Components and libraries

diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index c68b32fdca1e54aac618ba4c1f859d513b0766c8..313a742774a2b801fe8e2de4826fe13adb3a8813 100644 (file)
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -182,6 +182,10 @@ if(SC_QT OR SC_IDE)
        message(STATUS "Found Qt: " ${QtCore_location} )
     get_filename_component(QT_BIN_PATH ${QtCore_location} DIRECTORY CACHE)
 
+  if(QT_WEBENGINE)
+    message(STATUS "Building with QtWebEngine")
+    target_compile_definitions(libsclang PUBLIC QT_WEBENGINE)
+  endif()
        target_link_libraries(libsclang ${QT_COLLIDER_LIBS})
 endif()