diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-07-15 11:52:13 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2016-07-21 15:21:45 +0000 |
| commit | 396ee166355289165a611898440cf0f807d5cac8 (patch) | |
| tree | f8f35df05ce6365268e3c486298c0b370d824280 /src/tools/sdktool/rmkitoperation.cpp | |
| parent | 6fe82385d6110dcfc0b0bb6e493b726405610c6a (diff) | |
SDKtool: Add toolchain language support
Change-Id: I882cc129a603c758369446f947a961ccd2fd4490
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/tools/sdktool/rmkitoperation.cpp')
| -rw-r--r-- | src/tools/sdktool/rmkitoperation.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp index bc63fbd4c1..9bd313e43c 100644 --- a/src/tools/sdktool/rmkitoperation.cpp +++ b/src/tools/sdktool/rmkitoperation.cpp @@ -98,7 +98,7 @@ int RmKitOperation::execute() const bool RmKitOperation::test() const { QVariantMap tcMap = AddToolChainOperation::initializeToolChains(); - tcMap = AddToolChainOperation::addToolChain(tcMap, "{tc-id}", "TC", "/usr/bin/gcc", + tcMap = AddToolChainOperation::addToolChain(tcMap, "{tc-id}", "langId", "TC", "/usr/bin/gcc", "x86-linux-generic-elf-32bit", "x86-linux-generic-elf-32bit", KeyValuePairList()); @@ -114,17 +114,19 @@ bool RmKitOperation::test() const "desktop", "", 22, 10000, "uname", 1, KeyValuePairList()); + QHash<QString, QString> tcs; + tcs.insert("Cxx", "{tc-id}"); + QVariantMap map = AddKitOperation::addKit(AddKitOperation::initializeKits(), tcMap, qtMap, devMap, - "testId", "Test Qt Version", "/tmp/icon.png", - QString(), 1, "/usr/bin/gdb-test", "Desktop", - QString(), QString(), "{tc-id}", "{qt-id}", - "unsupported/mkspec", QStringList(), + "testId", "Test Qt Version", "/tmp/icon.png", QString(), 1, + "/usr/bin/gdb-test", "Desktop", QString(), QString(), tcs, + "{qt-id}", "unsupported/mkspec", QStringList(), KeyValuePairList() << KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))); map = AddKitOperation::addKit(map, tcMap, qtMap, devMap, "testId2", "Test Qt Version", "/tmp/icon2.png", QString(), 1, "/usr/bin/gdb-test2", - "Desktop", QString(), QString(), "{tc-id}", "{qt-id}", + "Desktop", QString(), QString(), tcs, "{qt-id}", "unsupported/mkspec2", QStringList(), KeyValuePairList() << KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue2"))); |