diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-18 16:20:22 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-18 15:28:11 +0000 |
| commit | 69eec9bf44af108e33d179aea8403964bd122ac5 (patch) | |
| tree | 185e26e771e7b74f774a69ab40c88856e8f7ae9f | |
| parent | 8cca696d8fc9891589e02f0be8bb820af717956c (diff) | |
Properly support disabling the use of precompiled headers.
We already had the respective properties, but they didn't do anything.
Change-Id: I2af86e325b6da13ea7f07eb132e207c8501ae467
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 4 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 6f54fe924..f94ebd60c 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -348,6 +348,7 @@ CppModule { } Rule { + condition: useCPrecompiledHeader inputs: ["c_pch_src"] explicitlyDependsOn: ["hpp"] Artifact { @@ -360,6 +361,7 @@ CppModule { } Rule { + condition: useCxxPrecompiledHeader inputs: ["cpp_pch_src"] explicitlyDependsOn: ["hpp"] Artifact { @@ -372,6 +374,7 @@ CppModule { } Rule { + condition: useObjcPrecompiledHeader inputs: ["objc_pch_src"] explicitlyDependsOn: ["hpp"] Artifact { @@ -384,6 +387,7 @@ CppModule { } Rule { + condition: useObjcxxPrecompiledHeader inputs: ["objcpp_pch_src"] explicitlyDependsOn: ["hpp"] Artifact { diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index 93f76ab38..27982811a 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -93,6 +93,7 @@ CppModule { } Rule { + condition: useCPrecompiledHeader inputs: ["c_pch_src"] explicitlyDependsOn: ["hpp"] Artifact { @@ -113,6 +114,7 @@ CppModule { } Rule { + condition: useCxxPrecompiledHeader inputs: ["cpp_pch_src"] explicitlyDependsOn: ["c_pch", "hpp"] // to prevent vc--0.pdb conflict Artifact { |