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

Qt Quick UI: Add "kit environment" as a base environment for run

Browse Source 
Change-Id: Ica4e63b4b8e56ee6d2ead0ad3a5d1b57de20009c
Task-number: QTCREATORBUG-14701
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-07-20 10:47:54 +02:00
parent fb1360cd31
commit be3fc0ef0b
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
View File

@@ -30,6 +30,8 @@
#include "qmlprojectenvironmentaspect.h" #include "qmlprojectenvironmentaspect.h"
#include <projectexplorer/target.h>
#include <projectexplorer/kit.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
namespace QmlProjectManager { namespace QmlProjectManager {
@@ -40,19 +42,27 @@ namespace QmlProjectManager {
QList<int> QmlProjectEnvironmentAspect::possibleBaseEnvironments() const QList<int> QmlProjectEnvironmentAspect::possibleBaseEnvironments() const
{ {
return QList<int>() << static_cast<int>(SystemEnvironmentBase); return QList<int>() << static_cast<int>(KitEnvironmentBase)
<< static_cast<int>(SystemEnvironmentBase);
} }
QString QmlProjectEnvironmentAspect::baseEnvironmentDisplayName(int base) const QString QmlProjectEnvironmentAspect::baseEnvironmentDisplayName(int base) const
{ {
if (base == static_cast<int>(SystemEnvironmentBase)) if (base == static_cast<int>(SystemEnvironmentBase))
return tr("System Environment"); return tr("System Environment");
if (base == static_cast<int>(KitEnvironmentBase))
return tr("Kit Environment");
return QString(); return QString();
} }
Utils::Environment QmlProjectManager::QmlProjectEnvironmentAspect::baseEnvironment() const Utils::Environment QmlProjectEnvironmentAspect::baseEnvironment() const
{ {
return Utils::Environment::systemEnvironment(); int base = baseEnvironmentBase();
Utils::Environment env = Utils::Environment::systemEnvironment();
if (base == static_cast<int>(KitEnvironmentBase))
runConfiguration()->target()->kit()->addToEnvironment(env);
return env;
} }
QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) : QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) :

3
src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h
View File

@@ -51,7 +51,8 @@ public:
private: private:
enum BaseEnvironmentBase { enum BaseEnvironmentBase {
SystemEnvironmentBase = 0 SystemEnvironmentBase = 0,
KitEnvironmentBase
}; };
}; };