Merge dev into 5.9

Change-Id: Id919bfd67d9d435fd5a05a892151a12ae5bcd3c0

1 files changed, 23 insertions, 28 deletions

diff --git a/src/src.pro b/src/src.pro
index 26abd52cc..7f8b39cd6 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -7,37 +7,32 @@ webengine_plugin.subdir = webengine/plugin
 webengine_plugin.target = sub-webengine-plugin
 webengine_plugin.depends = webengine
 
-SUBDIRS += core
+SUBDIRS += core \
+           process \
+           webengine \
+           webengine_plugin \
+           plugins
 
-!use?(gn) {
-    SUBDIRS += process \
-               webengine \
-               webengine_plugin \
-               plugins
 
+use?(spellchecker):!use?(native_spellchecker):!cross_compile {
+    SUBDIRS += qwebengine_convert_dict
+    qwebengine_convert_dict.subdir = tools/qwebengine_convert_dict
+    qwebengine_convert_dict.depends = core
+}
 
-    # allow only desktop builds of qwebengine_convert_dict
-    contains(WEBENGINE_CONFIG, use_spellchecker):!contains(WEBENGINE_CONFIG, use_native_spellchecker):!cross_compile {
-        SUBDIRS += qwebengine_convert_dict
-        qwebengine_convert_dict.subdir = tools/qwebengine_convert_dict
-        qwebengine_convert_dict.depends = core
-    }
+isQMLTestSupportApiEnabled() {
+    webengine_testsupport_plugin.subdir = webengine/plugin/testsupport
+    webengine_testsupport_plugin.target = sub-webengine-testsupport-plugin
+    webengine_testsupport_plugin.depends = webengine
+    SUBDIRS += webengine_testsupport_plugin
+}
 
-    isQMLTestSupportApiEnabled() {
-        webengine_testsupport_plugin.subdir = webengine/plugin/testsupport
-        webengine_testsupport_plugin.target = sub-webengine-testsupport-plugin
-        webengine_testsupport_plugin.depends = webengine
-        SUBDIRS += webengine_testsupport_plugin
-    }
+!contains(WEBENGINE_CONFIG, no_ui_delegates) {
+    SUBDIRS += webengine/ui \
+               webengine/ui2
+}
 
-    # FIXME: We probably want a bit more control over config options to tweak what to build/ship or not.
-    # Another example of where this could be necessary is to make it easy to build proprietery codecs support.
-    !contains(WEBENGINE_CONFIG, no_ui_delegates) {
-        SUBDIRS += webengine/ui \
-                   webengine/ui2
-    }
-    qtHaveModule(widgets) {
-        SUBDIRS += webenginewidgets
-        plugins.depends = webenginewidgets
-    }
+qtHaveModule(widgets) {
+   SUBDIRS += webenginewidgets
+   plugins.depends = webenginewidgets
 }