diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-10-07 13:24:44 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-10-07 14:02:45 +0200 |
| commit | f865f7d8acf97c1b8c22701ba7b64b3ed40a3536 (patch) | |
| tree | d06ae183ce31fe7c38520100a2bf762acaf8d1b6 | |
| parent | f0bfff81835a6c2f4fc992db211a1775408dd4d1 (diff) | |
| download | qt-creator-f865f7d8acf97c1b8c22701ba7b64b3ed40a3536.tar.gz | |
Update qbs submodule.
And do the required adaptation in QbsProjectManager.
Change-Id: Ib383ebf99ceb638a545158d426769bf963086a1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 5 | ||||
| m--------- | src/shared/qbs | 0 |
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 |