From f865f7d8acf97c1b8c22701ba7b64b3ed40a3536 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Tue, 7 Oct 2014 13:24:44 +0200
Subject: Update qbs submodule.

And do the required adaptation in QbsProjectManager.

Change-Id: Ib383ebf99ceb638a545158d426769bf963086a1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 5 ++---
 src/shared/qbs                                            | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 605100e06c..eaf1a02259 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -37,7 +37,7 @@
 #include <qtsupport/qtkitinformation.h>
 #include <utils/qtcassert.h>
 
-#include <tools/hostosinfo.h>
+#include <qbs.h>
 
 #include <QDir>
 #include <QFileInfo>
@@ -90,8 +90,7 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
                 }
             }
 
-            data.insert(QLatin1String(QBS_ARCHITECTURE),
-                        qbs::Internal::HostOsInfo::canonicalArchitecture(architecture));
+            data.insert(QLatin1String(QBS_ARCHITECTURE), qbs::canonicalArchitecture(architecture));
         }
 
         if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
diff --git a/src/shared/qbs b/src/shared/qbs
index 05cb6aff3b..b7e42fbe02 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 05cb6aff3b95d463d506e7295cb32018722038fb
+Subproject commit b7e42fbe02d6105c5e449e90f74ef16f30500440
-- 
cgit v1.2.1