Add UI delegates configure option

Change-Id: Ib9d6c8842609c4c410ca65a35fefeab481f71cb2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

configure.json

@@ -440,6 +440,10 @@
             "section": "WebEngine",
             "output": [ "privateFeature" ]
         },
+        "ui-delegates": {
+            "label": "UI Delegates",
+            "output": [ "privateFeature" ]
+        },
         "webrtc": {
             "label": "WebRTC",
             "purpose": "Provides WebRTC support.",

src/src.pro

+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
 }

src/webenginewidgets/webenginewidgets.pro

+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