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

Remove QBS_INSTALL_ROOT env var. This is no longer needed by Qbs.

Browse Source 
Change-Id: Idcf6d0ceffb35a2c3a28dbfb3757b8ca04133a15
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Jake Petroules
2015-01-07 10:17:42 -08:00
parent b072bc8660
commit 960b5b3bfa
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -329,7 +329,6 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
const qbs::ProductData product = findProduct(project->qbsProjectData(), m_uniqueProductName); const qbs::ProductData product = findProduct(project->qbsProjectData(), m_uniqueProductName);
if (product.isValid()) { if (product.isValid()) {
QProcessEnvironment procEnv = env.toProcessEnvironment(); QProcessEnvironment procEnv = env.toProcessEnvironment();
procEnv.insert(QLatin1String("QBS_INSTALL_ROOT"), installRoot());
procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), executable()); procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), executable());
qbs::RunEnvironment qbsRunEnv = project->qbsProject().getRunEnvironment(product, installOptions(), qbs::RunEnvironment qbsRunEnv = project->qbsProject().getRunEnvironment(product, installOptions(),
procEnv, QbsManager::settings()); procEnv, QbsManager::settings());