From 21a1b58a33ba79cbf83bb46bfcf19429b6a97ae2 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 8 Jun 2020 08:17:12 +0100 Subject: [PATCH] optional-qtwebengine-04-2005e6f18906b092686f8ed0f48b54c67acf01fd commit 2005e6f18906b092686f8ed0f48b54c67acf01fd Author: Nathan Ho Date: Sun Jun 2 01:43:36 2019 -0700 sclang: Connect CMake to QT_WEBENGINE macro Gbp-Pq: Name optional-qtwebengine-04-2005e6f18906b092686f8ed0f48b54c67acf01fd --- QtCollider/CMakeLists.txt | 4 +--- lang/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt index 1e4f78e..398fad8 100644 --- 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 c68b32f..313a742 100644 --- 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() -- 2.30.2