qbs build: Use precompiled headers.

It was an oversight that we haven't done this before.

Change-Id: Ic338503f6c1ca5e6c52c9af3bdbdb92b7776cac1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>

6 files changed, 26 insertions, 0 deletions

diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs
index 684a18cb12..e4dd782b11 100644
--- a/qbs/imports/QtcLibrary.qbs
+++ b/qbs/imports/QtcLibrary.qbs
@@ -5,6 +5,7 @@ QtcProduct {
     type: ["dynamiclibrary", "dynamiclibrary_symlink", "qtc.dev-module"]
     installDir: qtc.ide_library_path
     installTags: ["dynamiclibrary", "dynamiclibrary_symlink"]
+    useNonGuiPchFile: true
     Depends {
         condition: qtc.testsEnabled
         name: "Qt.test"
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index 88ec4dff16..ed6d2b6760 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -6,6 +6,7 @@ QtcProduct {
     type: ["dynamiclibrary", "pluginSpec", "qtc.dev-module"]
     installDir: qtc.ide_plugin_path
     installTags: ["dynamiclibrary"]
+    useGuiPchFile: true
 
     property var pluginJsonReplacements
     property var pluginRecommends: []
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs
index 3c789ed3de..fee3782c8c 100644
--- a/qbs/imports/QtcProduct.qbs
+++ b/qbs/imports/QtcProduct.qbs
@@ -9,6 +9,11 @@ Product {
     property string installDir
     property stringList installTags: type
     property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs"
+    property bool useNonGuiPchFile: false
+    property bool useGuiPchFile: false
+    property string pathToSharedSources: FileInfo.joinPaths(path,
+            FileInfo.relativePath(FileInfo.joinPaths('/', qtc.ide_qbs_imports_path),
+                                  FileInfo.joinPaths('/', qtc.ide_shared_sources_path)))
 
     Depends { name: "cpp" }
     Depends { name: "qtc" }
@@ -24,6 +29,7 @@ Product {
     }
     cpp.minimumOsxVersion: "10.7"
     cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2"
+    cpp.useCxxPrecompiledHeader: useNonGuiPchFile || useGuiPchFile
     cpp.visibility: "minimal"
 
     Depends { name: "Qt.core" }
@@ -39,4 +45,20 @@ Product {
         qbs.install: true
         qbs.installDir: qtc.ide_qbs_modules_path + '/' + product.name
     }
+
+    Group {
+        name: "standard pch file (non-gui)"
+        condition: useNonGuiPchFile
+        prefix: pathToSharedSources + '/'
+        files: ["qtcreator_pch.h"]
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Group {
+        name: "standard pch file (gui)"
+        condition: useGuiPchFile
+        prefix: pathToSharedSources + '/'
+        files: ["qtcreator_gui_pch.h"]
+        fileTags: ["cpp_pch_src"]
+    }
 }
diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs
index 7d75ba5ae7..e8dd54efaa 100644
--- a/qbs/imports/QtcTool.qbs
+++ b/qbs/imports/QtcTool.qbs
@@ -5,6 +5,7 @@ QtcProduct {
     type: ["application"]
     consoleApplication: true
     installDir:  qtc.ide_libexec_path
+    useNonGuiPchFile: true
 
     cpp.rpaths: {
         var relativePathToLibs = FileInfo.relativePath('/' + qtc.ide_libexec_path,
diff --git a/qbs/imports/src b/qbs/imports/src
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/qbs/imports/src
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 2b17ae1379..5f7e7de1b3 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -51,6 +51,7 @@ Module {
     property string ide_qbs_resources_path: "qbs-resources"
     property string ide_qbs_modules_path: ide_qbs_resources_path + "/modules"
     property string ide_qbs_imports_path: ide_qbs_resources_path + "/imports"
+    property string ide_shared_sources_path: "src/shared"
 
     property bool make_dev_package: false