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

Qbs: Add static method to retrieve preferences from QbsManager

Browse Source 
Change-Id: Ib18c4a8cf904a998c2a76ae6a7ed10d4d968b396
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Tobias Hunger
2013-02-15 13:29:52 +01:00
parent d2762af2e4
commit 82a1bfe29b
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,9 +388,9 @@ void QbsProject::parse(const QVariantMap &config, const QString &dir)
params.buildRoot = m_qbsBuildRoot;
params.projectFilePath = m_fileName;
params.ignoreDifferentProjectFilePath = false;
const qbs::Preferences prefs(m_manager->settings());
params.searchPaths = prefs.searchPaths(QLatin1String(QBS_BUILD_DIR));
params.pluginPaths = prefs.pluginPaths(QLatin1String(QBS_BUILD_DIR));
qbs::Preferences *prefs = QbsManager::preferences();
params.searchPaths = prefs->searchPaths(QLatin1String(QBS_BUILD_DIR));
params.pluginPaths = prefs->pluginPaths(QLatin1String(QBS_BUILD_DIR));
m_qbsSetupProjectJob
= qbs::Project::setupProject(params, m_manager->settings(), m_manager->logSink(), 0);