optional-qtwebengine-07-2cded7579d097de45a9a1e4c6ca8a87f3fd03e63
authorDebian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Mon, 8 Jun 2020 07:17:12 +0000 (08:17 +0100)
committerPeter Michael Green <plugwash@raspbian.org>
Mon, 8 Jun 2020 07:17:12 +0000 (08:17 +0100)
commit 2cded7579d097de45a9a1e4c6ca8a87f3fd03e63
Author: Nathan Ho <nathan@snappizz.com>
Date:   Sun Jun 2 01:43:41 2019 -0700

    sclang: Make sure WebView headers appear in QT_COLLIDER_SRCS unconditionally

Gbp-Pq: Name optional-qtwebengine-07-2cded7579d097de45a9a1e4c6ca8a87f3fd03e63

QtCollider/CMakeLists.txt

index e4ca9878043be3fdcc73554591ce74240a9862ba..f409979fe83877875e758c23d6b0ce6738c78479 100644 (file)
@@ -144,11 +144,13 @@ if(QT_COLLIDER_LANG_CLIENT)
     list(APPEND QT_COLLIDER_SRCS ${QT_COLLIDER_DIR}/LanguageClient.cpp)
 endif()
 
+set(QT_COLLIDER_WEBENGINE_HDRS
+  ${QT_COLLIDER_DIR}/widgets/QcWebView.h
+  ${QT_COLLIDER_DIR}/widgets/web_page.hpp
+)
+
 if(SC_USE_WEBENGINE)
-  list(APPEND QT_COLLIDER_HDRS
-    ${QT_COLLIDER_DIR}/widgets/QcWebView.h
-    ${QT_COLLIDER_DIR}/widgets/web_page.hpp
-  )
+  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
@@ -179,6 +181,7 @@ list( APPEND QT_COLLIDER_SRCS
   ${QT_COLLIDER_OBJCPP_SRCS}
   ${QT_COLLIDER_MOC_SRCS}
   ${QT_COLLIDER_RCC}
+  ${QT_COLLIDER_WEBENGINE_HDRS}
 )
 
 add_definitions(-DSC_QT -DQT_COLLIDER_EXPORTING -DQT_NO_KEYWORDS)