From aaac5fe1f9a1be81b919642e6272967f86fef1a5 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 13 Sep 2017 18:40:23 +0200
Subject: [PATCH] Add UI delegates configure option
Change-Id: Ib9d6c8842609c4c410ca65a35fefeab481f71cb2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
configure.json | 4 ++++
src/src.pro | 5 ++++-
src/webenginewidgets/webenginewidgets.pro | 5 ++++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index 76327d9c1..726d151c7 100644
--- a/configure.json
+++ b/configure.json
@@ -440,6 +440,10 @@
"section": "WebEngine",
"output": [ "privateFeature" ]
},
+ "ui-delegates": {
+ "label": "UI Delegates",
+ "output": [ "privateFeature" ]
+ },
"webrtc": {
"label": "WebRTC",
"purpose": "Provides WebRTC support.",
diff --git a/src/src.pro b/src/src.pro
index d9b57615d..d994fc0e9 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,3 +1,6 @@
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
+
TEMPLATE = subdirs
process.depends = core
@@ -30,7 +33,7 @@ isQMLTestSupportApiEnabled() {
SUBDIRS += webengine_testsupport_plugin
}
-!contains(WEBENGINE_CONFIG, no_ui_delegates) {
+qtConfig(ui-delegates) {
SUBDIRS += webengine/ui \
webengine/ui2
}
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index ad79c1ef9..10791a6ca 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -1,3 +1,6 @@
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
+
TARGET = QtWebEngineWidgets
# For our export macros
@@ -42,7 +45,7 @@ HEADERS = \
api/qwebengineview_p.h \
render_widget_host_view_qt_delegate_widget.h
-!contains(WEBENGINE_CONFIG, no_ui_delegates) {
+qtConfig(ui-delegates) {
SOURCES += ui/messagebubblewidget.cpp
HEADERS += ui/messagebubblewidget_p.h
DEFINES += QT_UI_DELEGATES
--
GitLab