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

Squish: Fix for renaming Targets to Kits

Browse Source 
Change-Id: Ia3faec39499bc7e65d5d0a0fb7963fcb4016c6d5
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
This commit is contained in:
Christian Stenger
2012-09-04 16:59:27 +02:00
parent 948abf10ae
commit efa91f005b
4 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/system/shared/utils.py
View File

@@ -283,17 +283,17 @@ def __checkParentAccess__(filePath):
test.fail("No execute permission on '%s'" % tmp)
# this function checks for all configured Qt versions inside
# options dialog and returns a dict holding the targets as keys
# and a list of supported versions as value
def getCorrectlyConfiguredTargets():
# options dialog and returns a dict holding the kits as keys
# and a list of information of its configured Qt
def getConfiguredKits():
def __retrieveQtVersionName__(target, version):
treeWidget = waitForObject(":QtSupport__Internal__QtVersionManager.qtdirList_QTreeWidget")
return treeWidget.currentItem().text(0)
targetQtVersionNames = {}
result = {}
targetsQtVersions, qtVersionNames = iterateQtVersions(True, __retrieveQtVersionName__)
clickTab(waitForObject(":Options.qt_tabwidget_tabbar_QTabBar"), "Targets")
treeView = waitForObject(":Targets_QTreeView")
clickTab(waitForObject(":Options.qt_tabwidget_tabbar_QTabBar"), "Kits")
treeView = waitForObject(":Kits_QTreeView")
model = treeView.model()
test.compare(model.rowCount(), 2, "Verifying expected target section count")
autoDetected = model.index(0, 0)
@@ -309,7 +309,7 @@ def getCorrectlyConfiguredTargets():
item = ".".join([str(section.data().toString()),
str(index.data().toString()).replace(".", "\\.")])
clickItem(treeView, item, 5, 5, 0, Qt.LeftButton)
qtVersionStr = str(waitForObject(":Targets_QtVersion_QComboBox").currentText)
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():
@@ -321,7 +321,7 @@ def getCorrectlyConfiguredTargets():
if targetInfo[0] == "Maemo":
result.update({targetName:
(QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.MAEMO5), targetInfo[1])})
test.log("Correctly configured targets: %s" % str(result))
test.log("Configured kits: %s" % str(result))
return result
def visibleCheckBoxExists(text):