aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-07-03 13:46:59 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-07-05 11:45:12 +0000
commitb20cb59c561283cef1435cebc45e392bcc8cbbde (patch)
tree0d4347337617ef3b2741c708e130e6b0568755db
parentc613d670a29ceab1b8fcfb432b32f0d2eaa7c482 (diff)
Cpp module: Default value for use*PrecompiledHeader is now true
This is of course the right default: If a precompiled header is present, then you will tpyically want to use it. We just couldn't do that so far, because we did not have access to the "explicitlyDependsOn" artifacts in the compiler rule. Now we do. [ChangeLog] The property cpp.useCxxPrecompiledHeader, as well as the variants for the other languages, now default to true. Change-Id: Ie04172790ad21b0ebdfbf3366b6f549f705e774c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--doc/reference/modules/cpp-module.qdoc2
-rw-r--r--share/qbs/modules/cpp/CppModule.qbs8
-rw-r--r--tests/auto/api/testdata/build-single-file/build-single-file.qbs1
-rw-r--r--tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs1
-rw-r--r--tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs1
-rw-r--r--tests/auto/api/testdata/rule-conflict/rule-conflict.qbs1
-rw-r--r--tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs1
7 files changed, 5 insertions, 10 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc
index 46c38b4cd..41d6a718d 100644
--- a/doc/reference/modules/cpp-module.qdoc
+++ b/doc/reference/modules/cpp-module.qdoc
@@ -195,7 +195,7 @@
useObjcxxPrecompiledHeader
\li \c bool
\li 1.5
- \li \c false
+ \li \c true
\li Specifies whether to use a precompiled header for the respective language, if one
is present (see \l{Relevant File Tags}{below} for the associated file tags).
\row
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 1c9f9b40e..1bb3d31c3 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -53,10 +53,10 @@ Module {
property bool enableReproducibleBuilds: false
property bool separateDebugInformation: false
property pathList prefixHeaders
- property bool useCPrecompiledHeader: false
- property bool useCxxPrecompiledHeader: false
- property bool useObjcPrecompiledHeader: false
- property bool useObjcxxPrecompiledHeader: false
+ property bool useCPrecompiledHeader: true
+ property bool useCxxPrecompiledHeader: true
+ property bool useObjcPrecompiledHeader: true
+ property bool useObjcxxPrecompiledHeader: true
property bool treatSystemHeadersAsDependencies: false
diff --git a/tests/auto/api/testdata/build-single-file/build-single-file.qbs b/tests/auto/api/testdata/build-single-file/build-single-file.qbs
index 0f24278be..eeb38a5ff 100644
--- a/tests/auto/api/testdata/build-single-file/build-single-file.qbs
+++ b/tests/auto/api/testdata/build-single-file/build-single-file.qbs
@@ -4,7 +4,6 @@ import qbs.TextFile
CppApplication {
files: ["ignored1.cpp", "ignored2.cpp", "compiled.cpp"]
- cpp.useCxxPrecompiledHeader: true
cpp.includePaths: [buildDirectory]
Group {
files: ["pch.h"]
diff --git a/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs b/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs
index 3e1e676ba..46de774b9 100644
--- a/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs
+++ b/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs
@@ -5,7 +5,6 @@ CppApplication {
name: "MyApp"
consoleApplication: true
cpp.includePaths: [product.buildDirectory]
- cpp.useCxxPrecompiledHeader: true
Group {
files: ["pch.h"]
fileTags: ["cpp_pch_src"]
diff --git a/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs b/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs
index 5c73c9670..e556a745b 100644
--- a/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs
+++ b/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs
@@ -3,7 +3,6 @@ import qbs 1.0
QtApplication {
name: "MyApp"
consoleApplication: true
- cpp.useCxxPrecompiledHeader: true
Group {
name: "precompiled headers"
files: ["stable.h"]
diff --git a/tests/auto/api/testdata/rule-conflict/rule-conflict.qbs b/tests/auto/api/testdata/rule-conflict/rule-conflict.qbs
index d2e1b9144..5b839076e 100644
--- a/tests/auto/api/testdata/rule-conflict/rule-conflict.qbs
+++ b/tests/auto/api/testdata/rule-conflict/rule-conflict.qbs
@@ -1,7 +1,6 @@
import qbs
CppApplication {
- cpp.useCxxPrecompiledHeader: true
files: "main.cpp"
Group {
name: "pch files"
diff --git a/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs b/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs
index 273ec682b..2cfb17337 100644
--- a/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs
+++ b/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs
@@ -1,7 +1,6 @@
import qbs
CppApplication {
- cpp.useCxxPrecompiledHeader: true
files: [
"header1.h",
"header2.cpp",