feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PE: Run process in ClangClToolChain::msvcPredefinedMacros only once

Browse Source 
Double-execution was accidentally introduced in
https://codereview.qt-project.org/c/qt-creator/qt-creator/+/349499/7..8
when rebasing on a merge from 4.15.

Change-Id: I3c108185a59b738d0e5176d9e9f0432b4cc3c453
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-20 13:42:50 +02:00
parent 6ffe16d90b
commit 61a3457729
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -1722,7 +1722,6 @@ Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
QStringList arguments = cxxflags; QStringList arguments = cxxflags;
arguments.append(gccPredefinedMacrosOptions(language())); arguments.append(gccPredefinedMacrosOptions(language()));
arguments.append("-"); arguments.append("-");
cpp.runBlocking({clangPath(), arguments});
cpp.setCommand({compilerCommand(), arguments}); cpp.setCommand({compilerCommand(), arguments});
cpp.runBlocking(); cpp.runBlocking();
if (cpp.result() != Utils::QtcProcess::Finished || cpp.exitCode() != 0) { if (cpp.result() != Utils::QtcProcess::Finished || cpp.exitCode() != 0) {