diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-28 09:55:34 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-02 18:42:22 +0000 |
| commit | 84f5db7008eff19377859ca13b51ffc7a51ceb88 (patch) | |
| tree | dc0e96fd00f2a53cd50910716e00c74bc6c7cde3 /qmake | |
| parent | 0a6aa1d4f031f986dde10399eacc82fc60731eca (diff) | |
qmake/vcxproj: Fix handling of extra compiler outputs
In commit 68866b1a7bcade79e425f609fc1680203b89112e we introduced a bug:
At a point where the first output of an extra compiler is extracted, we
try to evaluate the first output as qmake variable. This is as
nonsensical as it sounds and leads to malformed extra compiler output in
vcxproj files.
Task-number: QTBUG-87601
Change-Id: Ib9aaf8a6eed8c69243f364554325c240d0bfc7f4
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 93ac7b9d174d8ba2fcd9762c3ac836c3a1b000f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index e117f472e0..c830ae62f4 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1568,7 +1568,7 @@ void VcprojGenerator::initExtraCompilerOutputs() QString tmp_out; if (!outputs.isEmpty()) - tmp_out = project->first(outputs.first().toKey()).toQString(); + tmp_out = outputs.first().toQString(); if (project->values(ProKey(*it + ".CONFIG")).indexOf("combine") != -1) { // Combined output, only one file result extraCompile.addFile(Option::fixPathToTargetOS( |