diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-11-17 14:07:03 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-11-23 12:06:08 +0000 |
| commit | 2d777a8082c41e15e8f337eea032a4fdaf5ce8b2 (patch) | |
| tree | 0d0db0f3b057f63ec223b6f1d2aba0fc01fbbd61 /src/tools/sdktool/rmkitoperation.cpp | |
| parent | 5f6a3f90fb8dc8f125dfa13896724e8a682bfcc5 (diff) | |
SDKtool: Make AddKit handle cmake related settings
--cmake <ID>, --cmake-generator <GEN>:<EXTRA>:<TOOLSET>:<PLATFORM>
and --cmake-config "<KEY>:<TYPE>=<VALUE>" are now supported.
When using --cmake-generator <GEN> must be set, the rest is optional.
--cmake-config may be repeated several times. All will end up in the
kit in the sequence they appear on the command line.
Task-number: QTCREATORBUG-17290
Change-Id: Ida79d65095682331f53d0fbb36d606ad16e6c4ac
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/tools/sdktool/rmkitoperation.cpp')
| -rw-r--r-- | src/tools/sdktool/rmkitoperation.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp index 9bd313e43c..37dc58330e 100644 --- a/src/tools/sdktool/rmkitoperation.cpp +++ b/src/tools/sdktool/rmkitoperation.cpp @@ -119,15 +119,18 @@ bool RmKitOperation::test() const QVariantMap map = AddKitOperation::addKit(AddKitOperation::initializeKits(), tcMap, qtMap, devMap, + QVariantMap(), "testId", "Test Qt Version", "/tmp/icon.png", QString(), 1, "/usr/bin/gdb-test", "Desktop", QString(), QString(), tcs, - "{qt-id}", "unsupported/mkspec", QStringList(), + "{qt-id}", "unsupported/mkspec", + QString(), QString(), QString(), QString(), QString(), QStringList(), QStringList(), KeyValuePairList() << KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))); map = - AddKitOperation::addKit(map, tcMap, qtMap, devMap, "testId2", "Test Qt Version", + AddKitOperation::addKit(map, tcMap, qtMap, devMap, QVariantMap(), "testId2", "Test Qt Version", "/tmp/icon2.png", QString(), 1, "/usr/bin/gdb-test2", "Desktop", QString(), QString(), tcs, "{qt-id}", - "unsupported/mkspec2", QStringList(), + "unsupported/mkspec2", + QString(), QString(), QString(), QString(), QString(), QStringList(), QStringList(), KeyValuePairList() << KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue2"))); QVariantMap result = rmKit(map, "testId"); |