From 0c6c48da2ad5c60f5404636290eb82f492c2a1a8 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Fri, 21 Oct 2016 19:14:16 +0200
Subject: Add gn bootstrap to build system

Bootstraps gn wihout rebuild.

Change-Id: I09ee4d6b6f458f16f0d9ac18433823153ab75995
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/src.pro | 56 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

(limited to 'src/src.pro')

diff --git a/src/src.pro b/src/src.pro
index 9b5373181..3f793474f 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -7,33 +7,37 @@ webengine_plugin.subdir = webengine/plugin
 webengine_plugin.target = sub-webengine-plugin
 webengine_plugin.depends = webengine
 
-SUBDIRS += core \
-           process \
-           webengine \
-           webengine_plugin \
-           plugins
+SUBDIRS += 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
-}
+!contains(WEBENGINE_CONFIG, use_gn) {
+    SUBDIRS += process \
+               webengine \
+               webengine_plugin \
+               plugins
 
-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
-}
 
-# 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
+    # 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
+    }
+
+    # 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
+    }
 }
-- 
cgit v1.2.3