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/unixmake.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/unixmake.cpp')
-rw-r--r-- | qmake/generators/unix/unixmake.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index f4bc0e47ea..e56e8c41b6 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -198,9 +198,8 @@ UnixMakefileGenerator::init() QString headerSuffix; if (project->isActiveConfig("clang_pch_style")) headerSuffix = project->first("QMAKE_PCH_OUTPUT_EXT").toQString(); - else - pchBaseName += project->first("QMAKE_PCH_OUTPUT_EXT").toQString(); + pchBaseName += project->first("QMAKE_PCH_OUTPUT_EXT").toQString(); pchBaseName += Option::dir_sep; ProString language = project->first(ProKey("QMAKE_LANGUAGE_" + compiler)); @@ -319,8 +318,7 @@ QStringList if(!project->isEmpty("PRECOMPILED_DIR")) header_prefix = project->first("PRECOMPILED_DIR").toQString(); header_prefix += project->first("QMAKE_ORIG_TARGET").toQString(); - if (!project->isActiveConfig("clang_pch_style")) - header_prefix += project->first("QMAKE_PCH_OUTPUT_EXT").toQString(); + header_prefix += project->first("QMAKE_PCH_OUTPUT_EXT").toQString(); if (project->isActiveConfig("icc_pch_style")) { // icc style ProStringList pchArchs = project->values("QMAKE_PCH_ARCHS"); |