Add configure for webengine and webenginewidgets

Add possibility to build without widgets or qml support.
Move module related options to webengine's subconfigure.

Make proper dependencies between qml_module and qml_plugins.
Cleanup headers.

Fixes: QTBUG-68956
Task-number: QTBUG-70784
Change-Id: I4605d98b0d2c83c99af37e2186b5fbf10f8a6049
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 11 insertions, 81 deletions

diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
index 418ade9a8..23668229e 100644
--- a/src/webengine/webengine.pro
+++ b/src/webengine/webengine.pro
@@ -1,89 +1,19 @@
-include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) # workaround for QTBUG-68093
-QT_FOR_CONFIG += webenginecore-private
+TEMPLATE = subdirs
 
-TARGET = QtWebEngine
+qml_module.file = module.pro
+qml_plugin.file = plugin/plugin.pro
 
-# For our export macros
-DEFINES += QT_BUILD_WEBENGINE_LIB
+qml_plugin.depends = qml_module
 
-QT += qml quick webenginecore
-QT_PRIVATE += quick-private gui-private core-private webenginecore-private
-
-QMAKE_DOCS = $$PWD/doc/qtwebengine.qdocconf
-
-INCLUDEPATH += $$PWD api ../core ../core/api
-
-SOURCES = \
-        api/qquickwebengineaction.cpp \
-        api/qquickwebenginecertificateerror.cpp \
-        api/qquickwebenginecontextmenurequest.cpp \
-        api/qquickwebenginedialogrequests.cpp \
-        api/qquickwebenginedownloaditem.cpp \
-        api/qquickwebenginehistory.cpp \
-        api/qquickwebenginefaviconprovider.cpp \
-        api/qquickwebengineloadrequest.cpp \
-        api/qquickwebenginenavigationrequest.cpp \
-        api/qquickwebenginenewviewrequest.cpp \
-        api/qquickwebengineprofile.cpp \
-        api/qquickwebenginescript.cpp \
-        api/qquickwebenginesettings.cpp \
-        api/qquickwebenginesingleton.cpp \
-        api/qquickwebengineview.cpp \
-        api/qtwebengineglobal.cpp \
-        render_widget_host_view_qt_delegate_quick.cpp \
-        render_widget_host_view_qt_delegate_quickwindow.cpp \
-        ui_delegates_manager.cpp
-
-HEADERS = \
-        api/qtwebengineglobal.h \
-        api/qtwebengineglobal_p.h \
-        api/qquickwebengineaction_p.h \
-        api/qquickwebengineaction_p_p.h \
-        api/qquickwebenginecertificateerror_p.h \
-        api/qquickwebenginecontextmenurequest_p.h \
-        api/qquickwebenginedialogrequests_p.h \
-        api/qquickwebenginedownloaditem_p.h \
-        api/qquickwebenginedownloaditem_p_p.h \
-        api/qquickwebenginehistory_p.h \
-        api/qquickwebenginefaviconprovider_p_p.h \
-        api/qquickwebengineloadrequest_p.h \
-        api/qquickwebenginenavigationrequest_p.h \
-        api/qquickwebenginenewviewrequest_p.h \
-        api/qquickwebengineprofile.h \
-        api/qquickwebengineprofile_p.h \
-        api/qquickwebenginescript.h \
-        api/qquickwebenginescript_p.h \
-        api/qquickwebenginesettings_p.h \
-        api/qquickwebenginesingleton_p.h \
-        api/qquickwebengineview_p.h \
-        api/qquickwebengineview_p_p.h \
-        render_widget_host_view_qt_delegate_quick.h \
-        render_widget_host_view_qt_delegate_quickwindow.h \
-        ui_delegates_manager.h
+SUBDIRS += qml_module qml_plugin
 
 qtConfig(webengine-testsupport) {
-    QT_PRIVATE += testlib
-    SOURCES += api/qquickwebenginetestsupport.cpp
-    HEADERS += api/qquickwebenginetestsupport_p.h
+    testsupport_plugin.file = testsupport/testsupport.pro
+    testsupport_plugin.depends = qml_module
+    SUBDIRS += testsupport_plugin
 }
 
-!build_pass {
-    python = $$pythonPathForShell()
-    chromium_attributions.commands = \
-        cd $$shell_quote($$shell_path($$PWD/../3rdparty)) && \
-        $$python chromium/tools/licenses.py \
-        --file-template ../../tools/about_credits.tmpl \
-        --entry-template ../../tools/about_credits_entry.tmpl credits \
-        $$shell_quote($$shell_path($$OUT_PWD/chromium_attributions.qdoc))
-    chromium_attributions.CONFIG += phony
-
-    QMAKE_EXTRA_TARGETS += chromium_attributions
-
-    prepare_docs {
-        prepare_docs.depends += chromium_attributions
-    } else {
-        html_docs.depends += chromium_attributions
-    }
+qtConfig(webengine-ui-delegates) {
+    SUBDIRS += ui \
+               ui2
 }
-
-load(qt_module)