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

Qbs: Read QBS_BUILD_DIR also at runtime.

Browse Source 
This is necessary for people using the binary release.

Change-Id: I3e8821175c00812bdb8c65f0aedb8208894d08b2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Christian Kandeler
2013-02-21 16:21:27 +01:00
parent 34f083f1a4
commit 5e2e09c045
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -332,8 +332,9 @@ void QbsProject::parse(const QVariantMap &config, const QString &dir)
params.projectFilePath = m_fileName; params.projectFilePath = m_fileName;
params.ignoreDifferentProjectFilePath = false; params.ignoreDifferentProjectFilePath = false;
qbs::Preferences *prefs = QbsManager::preferences(); qbs::Preferences *prefs = QbsManager::preferences();
params.searchPaths = prefs->searchPaths(QLatin1String(QBS_BUILD_DIR)); const QString buildDir = qbsBuildDir();
params.pluginPaths = prefs->pluginPaths(QLatin1String(QBS_BUILD_DIR)); params.searchPaths = prefs->searchPaths(buildDir);
params.pluginPaths = prefs->pluginPaths(buildDir);
m_qbsSetupProjectJob m_qbsSetupProjectJob
= qbs::Project::setupProject(params, m_manager->settings(), m_manager->logSink(), 0); = qbs::Project::setupProject(params, m_manager->settings(), m_manager->logSink(), 0);
@@ -563,5 +564,14 @@ void QbsProject::updateQmlJsCodeModel(const qbs::ProjectData *prj)
modelManager->updateProjectInfo(projectInfo); modelManager->updateProjectInfo(projectInfo);
} }
QString QbsProject::qbsBuildDir() const
{
QString buildDir = Utils::Environment::systemEnvironment()
.value(QLatin1String("QBS_BUILD_DIR"));
if (buildDir.isEmpty())
buildDir = QLatin1String(QBS_BUILD_DIR);
return buildDir;
}
} // namespace Internal } // namespace Internal
} // namespace QbsProjectManager } // namespace QbsProjectManager

1
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -117,6 +117,7 @@ private:
void updateDocuments(const qbs::ProjectData *prj); void updateDocuments(const qbs::ProjectData *prj);
void updateCppCodeModel(const qbs::ProjectData *prj); void updateCppCodeModel(const qbs::ProjectData *prj);
void updateQmlJsCodeModel(const qbs::ProjectData *prj); void updateQmlJsCodeModel(const qbs::ProjectData *prj);
QString qbsBuildDir() const;
QbsManager *const m_manager; QbsManager *const m_manager;
const QString m_projectName; const QString m_projectName;