diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-24 12:10:14 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-24 15:06:14 +0100 |
| commit | ef8b1916dd61ca06d557be6fffc906c0d7658708 (patch) | |
| tree | ee0b7a40034c85d037e0abb933823435aacc9b5e | |
| parent | f6aba961979270820aa6c1b863c9a4aedcc1cdff (diff) | |
| download | qt-creator-ef8b1916dd61ca06d557be6fffc906c0d7658708.tar.gz | |
Update qbs submodule.
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>
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectmanager.cpp | 3 | ||||
| m--------- | src/shared/qbs | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index be1f99e266..89450275e9 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -35,6 +35,7 @@ #include "qbsprojectmanagerconstants.h" #include "qbsprojectmanagerplugin.h" +#include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> #include <extensionsystem/pluginmanager.h> #include <projectexplorer/kit.h> @@ -63,7 +64,7 @@ QbsManager::QbsManager(Internal::QbsProjectManagerPlugin *plugin) : m_plugin(plugin), m_defaultPropertyProvider(new DefaultPropertyProvider) { - m_settings = new qbs::Settings(QLatin1String("QtProject"), QLatin1String("qbs")); + m_settings = new qbs::Settings(Core::ICore::userResourcePath()); setObjectName(QLatin1String("QbsProjectManager")); connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(pushKitsToQbs())); diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 6f6606b798b2e9c3911b2a0794835089ab100cb +Subproject de8682b7d4fccdef5c93759336e51ab73ecd502 |