summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp5
m---------src/shared/qbs0
2 files changed, 2 insertions, 3 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
-Subproject 05cb6aff3b95d463d506e7295cb32018722038f
+Subproject b7e42fbe02d6105c5e449e90f74ef16f3050044