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

Squish: Allow automatically created kits

Browse Source 
Linking to Qt makes the respective configured kits become
auto detected and these have a fixed Qt.
The Qt version combo box for these kits is disabled on the
Kits page, so be more relaxed when checking kits page.

Change-Id: Ieb7e22b47bd5e5c5603e85dc0ddf2421427e85d6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2021-03-12 13:44:52 +01:00
parent 412b661672
commit da53e3f994
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,7 @@ def getConfiguredKits():
# end of internal function for iterateQtVersions # end of internal function for iterateQtVersions
def __setQtVersionForKit__(kit, kitName, kitsQtVersionName): def __setQtVersionForKit__(kit, kitName, kitsQtVersionName):
mouseClick(waitForObjectItem(":BuildAndRun_QTreeView", kit)) mouseClick(waitForObjectItem(":BuildAndRun_QTreeView", kit))
qtVersionStr = str(waitForObject(":Kits_QtVersion_QComboBox").currentText) qtVersionStr = str(waitForObjectExists(":Kits_QtVersion_QComboBox").currentText)
kitsQtVersionName[kitName] = qtVersionStr kitsQtVersionName[kitName] = qtVersionStr
# end of internal function for iterate kits # end of internal function for iterate kits

2
tests/system/suite_general/tst_default_settings/test.py
View File

@@ -149,7 +149,7 @@ def __qtFunc__(it, foundQt, qmakePath):
def __kitFunc__(it, foundQt, foundCompNames): def __kitFunc__(it, foundQt, foundCompNames):
global currentSelectedTreeItem, warningOrError global currentSelectedTreeItem, warningOrError
qtVersionStr = str(waitForObject(":Kits_QtVersion_QComboBox").currentText) qtVersionStr = str(waitForObjectExists(":Kits_QtVersion_QComboBox").currentText)
test.compare(it, "Desktop (default)", "Verifying whether default Desktop kit has been created.") test.compare(it, "Desktop (default)", "Verifying whether default Desktop kit has been created.")
if foundQt: if foundQt:
test.compare(qtVersionStr, foundQt, "Verifying if Qt versions match.") test.compare(qtVersionStr, foundQt, "Verifying if Qt versions match.")