diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-06-21 14:40:12 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-06-26 08:19:33 +0000 |
| commit | 527484bba9057e3fe30c9fff2a53b556ef23b81c (patch) | |
| tree | 72b8fe35f41b3098b48f993a8f99878bb3a4bb28 /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | 7799f7fa216736503e040e5fbb1b503f88c942f3 (diff) | |
QtVersion: Allow to override ABIs via SDKtool
Allow for overriding the ABIs detected for a Qt version from the
sdktool.
Leave the default at "auto-detect ABI".
Change-Id: Ibe2625b0a321a9541512d36a91aa2e42611a959b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 86c188617c..d0e892eaed 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -74,6 +74,8 @@ static const char QTVERSION_OVERRIDE_FEATURES[] = "overrideFeatures"; static const char QTVERSIONQMAKEPATH[] = "QMakePath"; static const char QTVERSIONSOURCEPATH[] = "SourcePath"; +static const char QTVERSION_ABIS[] = "Abis"; + static const char MKSPEC_VALUE_LIBINFIX[] = "QT_LIBINFIX"; static const char MKSPEC_VALUE_NAMESPACE[] = "QT_NAMESPACE"; @@ -503,6 +505,12 @@ void BaseQtVersion::fromMap(const QVariantMap &map) m_qtSources = Utils::FileName::fromUserInput( map.value(QTVERSIONSOURCEPATH).toString()); + // Handle ABIs provided by the SDKTool: + // Note: Creator does not write these settings itself, so it has to come from the SDKTool! + m_qtAbis = Utils::transform(map.value(QTVERSION_ABIS, QStringList()).toStringList(), &Abi::fromString); + m_qtAbis = Utils::filtered(m_qtAbis, &Abi::isValid); + m_hasQtAbis = !m_qtAbis.isEmpty(); + QFileInfo fi(string); if (BuildableHelperLibrary::isQtChooser(fi)) { // we don't want to treat qtchooser as a normal qmake |