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

QbsProjectManager: Make QbsManager instance available as a Singleton.

Browse Source 
We now use it in contexts that do not have access to a Project.

Change-Id: I96ebad60f5fc354b004092748033d83c766a305d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2014-11-24 17:21:21 +01:00
parent f19ec81a67
commit 6804c21179
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,6 @@
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/mimedatabase.h>
#include <cpptools/cppmodelmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildtargetinfo.h>
@@ -631,9 +630,7 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
registerQbsProjectParser(new QbsProjectParser(this, m_qbsUpdateFutureInterface));
QbsManager * const qbsManager = ExtensionSystem::PluginManager::getObject<QbsManager>();
QTC_ASSERT(qbsManager, return);
qbsManager->updateProfileIfNecessary(activeTarget()->kit());
QbsManager::instance()->updateProfileIfNecessary(activeTarget()->kit());
m_qbsProjectParser->parse(config, env, dir);
emit projectParsingStarted();
}