diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-27 01:00:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-27 01:00:50 +0200 |
| commit | 8bcecd86fac60475a7236787b4b89460fa89d612 (patch) | |
| tree | 947fc6b3b097c615e7cb2611c2df9f2fabdaac1c /qmake/generators/unix/unixmake2.cpp | |
| parent | 7b3bdcbfe8a920c4c156e91324eb0b374533d42c (diff) | |
| parent | dd0cd711708f65c429f807f42456bff14404f9c0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I182a639748760393f9e6b0724259201588aeaae3
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) |