diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-14 13:03:46 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-19 13:53:21 +0100 |
| commit | 26e876912435bdafbca2b425af43824d7ec5b876 (patch) | |
| tree | b7ee83cdd9de18ce5970bab0bb217a972d3d2445 /qmake/generators/unix/unixmake2.cpp | |
| parent | 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6bc (diff) | |
| parent | bac999f38ca10147832846f6d7df1e4a051d3760 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 79d19cae8c..a87fbe0fc3 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1006,8 +1006,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) if(!project->isEmpty("PRECOMPILED_DIR")) precomph_out_dir = project->first("PRECOMPILED_DIR"); precomph_out_dir += project->first("QMAKE_ORIG_TARGET"); - if (!project->isActiveConfig("clang_pch_style")) - precomph_out_dir += project->first("QMAKE_PCH_OUTPUT_EXT"); + precomph_out_dir += project->first("QMAKE_PCH_OUTPUT_EXT"); if (project->isActiveConfig("icc_pch_style")) { // icc style @@ -1126,8 +1125,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) if(!project->isEmpty("PRECOMPILED_DIR")) pchOutput = project->first("PRECOMPILED_DIR"); pchOutput += pchBaseName; - if (!project->isActiveConfig("clang_pch_style")) - pchOutput += project->first("QMAKE_PCH_OUTPUT_EXT"); + pchOutput += project->first("QMAKE_PCH_OUTPUT_EXT"); if (!project->isActiveConfig("icc_pch_style")) { // gcc style (including clang_pch_style) |