From da53e3f9941a5210e56ca7362c64a234ba446cca Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 12 Mar 2021 13:44:52 +0100 Subject: [PATCH] Squish: Allow automatically created kits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tests/system/shared/utils.py | 2 +- tests/system/suite_general/tst_default_settings/test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index e3adb5c49d5..e31ed30c200 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -367,7 +367,7 @@ def getConfiguredKits(): # end of internal function for iterateQtVersions def __setQtVersionForKit__(kit, kitName, kitsQtVersionName): mouseClick(waitForObjectItem(":BuildAndRun_QTreeView", kit)) - qtVersionStr = str(waitForObject(":Kits_QtVersion_QComboBox").currentText) + qtVersionStr = str(waitForObjectExists(":Kits_QtVersion_QComboBox").currentText) kitsQtVersionName[kitName] = qtVersionStr # end of internal function for iterate kits diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index 9a15e2b8fae..4db29858bb7 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -149,7 +149,7 @@ def __qtFunc__(it, foundQt, qmakePath): def __kitFunc__(it, foundQt, foundCompNames): 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.") if foundQt: test.compare(qtVersionStr, foundQt, "Verifying if Qt versions match.")