Squish: Updated getConfiguredKits()

Change-Id: I3f9dc08ce45eb773366a05de96a685a82266a54b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

tests/system/objects.map

@@ -25,7 +25,7 @@
 :Failed to start application_QMessageBox	{type='QMessageBox' unnamed='1' visible='1' windowTitle='Failed to start application'}
 :Generator:_QComboBox	{buddy=':CMake Wizard.Generator:_QLabel' type='QComboBox' unnamed='1' visible='1'}
 :Kits_QTreeView	{container=':qt_tabwidget_stackedwidget_QWidget' type='QTreeView' unnamed='1' visible='1'}
-:Kits_QtVersion_QComboBox	{container=':qt_tabwidget_stackedwidget_QWidget' occurrence='4' type='QComboBox' unnamed='1' visible='1'}
+:Kits_QtVersion_QComboBox	{container=':qt_tabwidget_stackedwidget_QWidget' occurrence='5' type='QComboBox' unnamed='1' visible='1'}
 :New.frame_QFrame	{name='frame' type='QFrame' visible='1' window=':New_Core::Internal::NewDialog'}
 :New.templateCategoryView_QTreeView	{name='templateCategoryView' type='QTreeView' visible='1' window=':New_Core::Internal::NewDialog'}
 :New_Core::Internal::NewDialog	{name='Core__Internal__NewDialog' type='Core::Internal::NewDialog' visible='1' windowTitle='New'}

tests/system/shared/utils.py

@@ -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():