Commit 6d8e3529 authored by Robert Loehning's avatar Robert Loehning
Browse files

Squish: Fixed typos and white spaces in getConfiguredKits()



Change-Id: Ic5b678af17232c3ebc2da448bb45f97160aa650c
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent 7c07ad9e
...@@ -291,7 +291,7 @@ def __checkParentAccess__(filePath): ...@@ -291,7 +291,7 @@ def __checkParentAccess__(filePath):
# this function checks for all configured Qt versions inside # this function checks for all configured Qt versions inside
# options dialog and returns a dict holding the kits as keys # options dialog and returns a dict holding the kits as keys
# and a list of information of its configured Qt # and a list of information of its configured Qt
def getConfiguredKits(isMaddedDisabled=True): def getConfiguredKits(isMaddeDisabled=True):
def __retrieveQtVersionName__(target, version): def __retrieveQtVersionName__(target, version):
treeWidget = waitForObject(":QtSupport__Internal__QtVersionManager.qtdirList_QTreeWidget") treeWidget = waitForObject(":QtSupport__Internal__QtVersionManager.qtdirList_QTreeWidget")
return treeWidget.currentItem().text(0) return treeWidget.currentItem().text(0)
...@@ -310,8 +310,8 @@ def getConfiguredKits(isMaddedDisabled=True): ...@@ -310,8 +310,8 @@ def getConfiguredKits(isMaddedDisabled=True):
# update collected Qt versions with their configured device and version # update collected Qt versions with their configured device and version
iterateKits(True, True, __setQtVersionForKit__, kitsWithQtVersionName) iterateKits(True, True, __setQtVersionForKit__, kitsWithQtVersionName)
# merge defined target names with their configured Qt versions and devices # merge defined target names with their configured Qt versions and devices
for kit,qtVersion in kitsWithQtVersionName.iteritems(): for kit, qtVersion in kitsWithQtVersionName.iteritems():
if isMaddedDisabled and kit in ('Fremantle', 'Harmattan') and qtVersion == 'None': if isMaddeDisabled and kit in ('Fremantle', 'Harmattan') and qtVersion == 'None':
test.log("Found Kit '%s' with unassigned Qt version (disabled Madde plugin)" % kit) test.log("Found Kit '%s' with unassigned Qt version (disabled Madde plugin)" % kit)
elif qtVersion in qtVersionNames: elif qtVersion in qtVersionNames:
result[kit] = targetsQtVersions[qtVersionNames.index(qtVersion)].items()[0] result[kit] = targetsQtVersions[qtVersionNames.index(qtVersion)].items()[0]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment