Commit ba5f8cd9 authored by Joerg Bornemann's avatar Joerg Bornemann
Browse files

WinRt: use the build environment for winrtrunner



Task-number: QTCREATORBUG-11998

Change-Id: Iafc7eb9ecd3c933c910756a8a855cbccf0af4b32
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
Reviewed-by: default avatarAndrew Knight <andrew.knight@digia.com>
parent e60860d8
...@@ -34,12 +34,14 @@ ...@@ -34,12 +34,14 @@
#include <coreplugin/idocument.h> #include <coreplugin/idocument.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildtargetinfo.h> #include <projectexplorer/buildtargetinfo.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
using ProjectExplorer::BuildConfiguration;
using ProjectExplorer::DeviceKitInformation; using ProjectExplorer::DeviceKitInformation;
using ProjectExplorer::IDevice; using ProjectExplorer::IDevice;
using ProjectExplorer::RunControl; using ProjectExplorer::RunControl;
...@@ -82,6 +84,9 @@ WinRtRunControl::WinRtRunControl(WinRtRunConfiguration *runConfiguration, RunMod ...@@ -82,6 +84,9 @@ WinRtRunControl::WinRtRunControl(WinRtRunConfiguration *runConfiguration, RunMod
m_arguments = runConfiguration->arguments(); m_arguments = runConfiguration->arguments();
m_uninstallAfterStop = runConfiguration->uninstallAfterStop(); m_uninstallAfterStop = runConfiguration->uninstallAfterStop();
if (BuildConfiguration *bc = target->activeBuildConfiguration())
m_environment = bc->environment();
} }
void WinRtRunControl::start() void WinRtRunControl::start()
...@@ -196,6 +201,7 @@ bool WinRtRunControl::startWinRtRunner() ...@@ -196,6 +201,7 @@ bool WinRtRunControl::startWinRtRunner()
m_state = StartingState; m_state = StartingState;
m_process->setUseCtrlCStub(true); m_process->setUseCtrlCStub(true);
m_process->setCommand(m_runnerFilePath, runnerArgs); m_process->setCommand(m_runnerFilePath, runnerArgs);
m_process->setEnvironment(m_environment);
m_process->setWorkingDirectory(QFileInfo(m_executableFilePath).absolutePath()); m_process->setWorkingDirectory(QFileInfo(m_executableFilePath).absolutePath());
m_process->start(); m_process->start();
return true; return true;
......
...@@ -78,6 +78,7 @@ private: ...@@ -78,6 +78,7 @@ private:
bool m_uninstallAfterStop; bool m_uninstallAfterStop;
bool m_isWinPhone; bool m_isWinPhone;
Utils::QtcProcess *m_process; Utils::QtcProcess *m_process;
Utils::Environment m_environment;
}; };
} // namespace Internal } // namespace Internal
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment