Skip to content

Commit

Permalink
qmake/vcxproj: Fix handling of extra compiler outputs
Browse files Browse the repository at this point in the history
In commit 68866b1 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 <[email protected]>
Reviewed-by: Oliver Wolff <[email protected]>
(cherry picked from commit 93ac7b9)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
  • Loading branch information
jobor authored and Qt Cherry-pick Bot committed Nov 2, 2020
1 parent 0a6aa1d commit 84f5db7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion qmake/generators/win32/msvc_vcproj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 84f5db7

Please sign in to comment.