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

Update qbs submodule.

Browse Source 
And do the necessary adaptation in the Qbs project manager, namely
giving the qbs::Settings object a base directory. The respective change
in the qbs API is necessary for being able to run more than one QtC
instance at the same time without ill effects.

Change-Id: I6859a6616bd744915aa21c3f07b6c45243899de5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2014-02-24 12:10:14 +01:00
parent f6aba96197
commit ef8b1916dd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@
#include "qbsprojectmanagerconstants.h" #include "qbsprojectmanagerconstants.h"
#include "qbsprojectmanagerplugin.h" #include "qbsprojectmanagerplugin.h"
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
@@ -63,7 +64,7 @@ QbsManager::QbsManager(Internal::QbsProjectManagerPlugin *plugin) :
m_plugin(plugin), m_plugin(plugin),
m_defaultPropertyProvider(new DefaultPropertyProvider) m_defaultPropertyProvider(new DefaultPropertyProvider)
{ {
m_settings = new qbs::Settings(QLatin1String("QtProject"), QLatin1String("qbs")); m_settings = new qbs::Settings(Core::ICore::userResourcePath());
setObjectName(QLatin1String("QbsProjectManager")); setObjectName(QLatin1String("QbsProjectManager"));
connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(pushKitsToQbs())); connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(pushKitsToQbs()));

2
src/shared/qbs

Submodule src/shared/qbs updated: 6f6606b798...de8682b7d4