feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Updated getConfiguredKits()

Browse Source 
Change-Id: I3f9dc08ce45eb773366a05de96a685a82266a54b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
This commit is contained in:
Robert Loehning
2012-09-07 15:59:15 +02:00
parent 15ea29533a
commit 394f6d2db6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/utils.py
+6 -2
View File
@@ -311,8 +311,12 @@ def getConfiguredKits():
qtVersionStr = str(waitForObject(":Kits_QtVersion_QComboBox").currentText)
targetQtVersionNames[targetName] = qtVersionStr
# merge defined target names with their configured Qt versions and devices
for target,qtVersion in targetQtVersionNames.iteritems():
result[target] = targetsQtVersions[qtVersionNames.index(qtVersion)].items()[0]
for kit,qtVersion in targetQtVersionNames.iteritems():
if qtVersion in qtVersionNames:
result[kit] = targetsQtVersions[qtVersionNames.index(qtVersion)].items()[0]
else:
test.fail("Qt version '%s' for kit '%s' can't be found in qtVersionNames."
% (qtVersion, kit))
clickButton(waitForObject(":Options.Cancel_QPushButton"))
# adjust device name(s) to match getStringForTarget() - some differ from time to time
for targetName in result.keys():