diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2014-04-07 11:11:17 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-04-07 11:34:00 +0200 |
| commit | 8332e665292bf52d3dcad64512631fdfe3a3a9dd (patch) | |
| tree | 2d22d7ae86dbe95abb2317458eb42aa957e1e404 /src/tools/sdktool/addkitoperation.cpp | |
| parent | c5129ecc7bb2b3131de21df058e61428de858d67 (diff) | |
| download | qt-creator-8332e665292bf52d3dcad64512631fdfe3a3a9dd.tar.gz | |
SDKtool: Correctly handle mac ABIs
Task-number: QTCREATORBUG-11983
Change-Id: Id70bd18b1b5494db19adb9928277356c4d4a4688
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/tools/sdktool/addkitoperation.cpp')
| -rw-r--r-- | src/tools/sdktool/addkitoperation.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index ec32e4b9a9..5bb87326db 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -309,6 +309,16 @@ bool AddKitOperation::test() const KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue")))); if (empty.isEmpty()) return false; + // QTCREATORBUG-11983, mach_o was not covered by the first attempt to fix this. + empty = addKit(map, tcMap, qtMap, devMap, + QLatin1String("testId"), QLatin1String("Test Kit"), QLatin1String("/tmp/icon.png"), + QString(), 1, QLatin1String("/usr/bin/gdb-test"), + QByteArray("Desktop"), QLatin1String("{dev-id}"), QString(), + QLatin1String("x86-macos-generic-mach_o-64bit"), QLatin1String("{qt-id}"), QLatin1String("unsupported/mkspec"), + KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue")))); + if (empty.isEmpty()) + return false; + // Fail if Qt is not there: empty = addKit(map, tcMap, qtMap, devMap, QLatin1String("testId"), QLatin1String("Test Kit"), QLatin1String("/tmp/icon.png"), @@ -510,7 +520,7 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t } if (!tc.isEmpty() && !AddToolChainOperation::exists(tcMap, tc)) { - QRegExp abiRegExp = QRegExp(QLatin1String("[a-z0-9]+-[a-z0-9]+-[a-z0-9]+-[a-z0-9]+-(8|16|32|64|128)bit")); + QRegExp abiRegExp = QRegExp(QLatin1String("[a-z0-9_]+-[a-z0-9_]+-[a-z0-9_]+-[a-z0-9_]+-(8|16|32|64|128)bit")); if (!abiRegExp.exactMatch(tc)) { std::cerr << "Error: Toolchain " << qPrintable(tc) << " does not exist." << std::endl; return QVariantMap(); |