diff options
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index d83169402c..921f1c8c75 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -200,10 +200,10 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config) SynchronousProcess cmake; cmake.setTimeoutS(5); - cmake.setFlags(SynchronousProcess::UnixTerminalDisabled); + cmake.setDisableUnixTerminal(); Environment env = Environment::systemEnvironment(); - Environment::setupEnglishOutput(&env); - cmake.setProcessEnvironment(env.toProcessEnvironment()); + env.setupEnglishOutput(); + cmake.setEnvironment(env); cmake.setTimeOutMessageBoxEnabled(false); QString cmakeGenerator @@ -239,8 +239,8 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config) } qCDebug(cmInputLog) << "CMake probing for qmake path: " << cmakeExecutable.toUserOutput() << args; - cmake.runBlocking({cmakeExecutable, args}); - + cmake.setCommand({cmakeExecutable, args}); + cmake.runBlocking(); QFile qmakeLocationTxt(qtcQMakeProbeDir.path() + "/qmake-location.txt"); if (!qmakeLocationTxt.open(QIODevice::ReadOnly)) { |