Skip to content
Snippets Groups Projects
Commit ef8b1916 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

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: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent f6aba961
No related branches found
No related tags found
No related merge requests found
......@@ -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()));
......
Subproject commit 6f6606b798b2e9c3911b2a0794835089ab100cb8
Subproject commit de8682b7d4fccdef5c93759336e51ab73ecd5021
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment