diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 605100e06c8..eaf1a022592 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 05cb6aff3b9..b7e42fbe02d 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 05cb6aff3b95d463d506e7295cb32018722038fb
+Subproject commit b7e42fbe02d6105c5e449e90f74ef16f30500440