forked from qt-creator/qt-creator
Update qbs submodule.
And do the required adaptation in QbsProjectManager. Change-Id: Ib383ebf99ceb638a545158d426769bf963086a1a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
@@ -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) {
|
||||
|
Submodule src/shared/qbs updated: 05cb6aff3b...b7e42fbe02
Reference in New Issue
Block a user