From ef8b1916dd61ca06d557be6fffc906c0d7658708 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Mon, 24 Feb 2014 12:10:14 +0100
Subject: [PATCH] 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>
---
 src/plugins/qbsprojectmanager/qbsprojectmanager.cpp | 3 ++-
 src/shared/qbs                                      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
index be1f99e2665..89450275e90 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
index 6f6606b798b..de8682b7d4f 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 6f6606b798b2e9c3911b2a0794835089ab100cb8
+Subproject commit de8682b7d4fccdef5c93759336e51ab73ecd5021