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

Qbs: Simplify qbsmanager

Browse Source 
Change-Id: I6755e28e1f75788203a0e734cd1b6dabd2308919
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-06-16 14:32:59 +02:00
parent 42dc63eacd
commit e07ea93d89
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,7 +437,7 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
baseConfig.insert(specialKey, userConfig.take(specialKey)); baseConfig.insert(specialKey, userConfig.take(specialKey));
params.setBuildConfiguration(baseConfig); params.setBuildConfiguration(baseConfig);
params.setOverriddenValues(userConfig); params.setOverriddenValues(userConfig);
qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings()); qbs::ErrorInfo err = params.expandBuildConfiguration(QbsManager::settings());
if (err.hasError()) { if (err.hasError()) {
generateErrors(err); generateErrors(err);
return; return;
@@ -478,7 +478,7 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
QTC_ASSERT(!m_qbsSetupProjectJob, return); QTC_ASSERT(!m_qbsSetupProjectJob, return);
m_qbsSetupProjectJob m_qbsSetupProjectJob
= qbs::Project::setupProject(params, m_manager->logSink(), 0); = qbs::Project::setupProject(params, QbsManager::logSink(), 0);
connect(m_qbsSetupProjectJob, SIGNAL(finished(bool,qbs::AbstractJob*)), connect(m_qbsSetupProjectJob, SIGNAL(finished(bool,qbs::AbstractJob*)),
this, SLOT(handleQbsParsingDone(bool))); this, SLOT(handleQbsParsingDone(bool)));

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

@@ -59,6 +59,7 @@ static QString qtcProfilePrefix() { return qtcProfileGroup() + sep; }
namespace QbsProjectManager { namespace QbsProjectManager {
qbs::Settings *QbsManager::m_settings = 0; qbs::Settings *QbsManager::m_settings = 0;
Internal::QbsLogSink *QbsManager::m_logSink = 0;
QbsManager::QbsManager() : QbsManager::QbsManager() :
m_defaultPropertyProvider(new DefaultPropertyProvider) m_defaultPropertyProvider(new DefaultPropertyProvider)
@@ -120,11 +121,6 @@ void QbsManager::setProfileForKit(const QString &name, const ProjectExplorer::Ki
m_settings->setValue(qtcProfilePrefix() + k->id().toString(), name); m_settings->setValue(qtcProfilePrefix() + k->id().toString(), name);
} }
qbs::Settings *QbsManager::settings()
{
return m_settings;
}
void QbsManager::addProfile(const QString &name, const QVariantMap &data) void QbsManager::addProfile(const QString &name, const QVariantMap &data)
{ {
qbs::Profile profile(name, settings()); qbs::Profile profile(name, settings());

6
src/plugins/qbsprojectmanager/qbsprojectmanager.h
View File

@@ -72,8 +72,8 @@ public:
QString profileForKit(const ProjectExplorer::Kit *k) const; QString profileForKit(const ProjectExplorer::Kit *k) const;
void setProfileForKit(const QString &name, const ProjectExplorer::Kit *k); void setProfileForKit(const QString &name, const ProjectExplorer::Kit *k);
static qbs::Settings *settings(); static qbs::Settings *settings() { return m_settings; }
Internal::QbsLogSink *logSink() { return m_logSink; } static Internal::QbsLogSink *logSink() { return m_logSink; }
private slots: private slots:
void pushKitsToQbs(); void pushKitsToQbs();
@@ -84,7 +84,7 @@ private:
void addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k); void addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k);
void addProfileFromKit(const ProjectExplorer::Kit *k); void addProfileFromKit(const ProjectExplorer::Kit *k);
Internal::QbsLogSink *m_logSink; static Internal::QbsLogSink *m_logSink;
static qbs::Settings *m_settings; static qbs::Settings *m_settings;
DefaultPropertyProvider *m_defaultPropertyProvider; DefaultPropertyProvider *m_defaultPropertyProvider;