summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2018-05-31 17:28:49 +0200
committerRobert Loehning <robert.loehning@qt.io>2018-06-01 09:25:16 +0000
commit2a3bfea8a9034791148f9639966b47760f883bf8 (patch)
tree9578a77adb784ab38ab19cef785d8a133a6f224d
parent234980699d2c5563baf9ae6d868a9f197f400f7b (diff)
downloadqt-creator-2a3bfea8a9034791148f9639966b47760f883bf8.tar.gz
Squish: Update for changed Options dialog
Change-Id: I823e88e80a00079dbf0a2cbdfd72973d44001063 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--tests/system/shared/utils.py6
-rw-r--r--tests/system/suite_general/tst_default_settings/test.py8
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index 0b8fb5818f..e89e969a7e 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -433,8 +433,8 @@ def iterateQtVersions(keepOptionsOpen=False, alreadyOnOptionsDialog=False,
additionalResult = []
if not alreadyOnOptionsDialog:
invokeMenuItem("Tools", "Options...")
- waitForObjectItem(":Options_QListView", "Build & Run")
- clickItem(":Options_QListView", "Build & Run", 14, 15, 0, Qt.LeftButton)
+ waitForObjectItem(":Options_QListView", "Kits")
+ clickItem(":Options_QListView", "Kits", 14, 15, 0, Qt.LeftButton)
clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Qt Versions")
pattern = re.compile("Qt version (?P<version>.*?) for (?P<target>.*)")
treeView = waitForObject(":qtdirList_QTreeView")
@@ -495,7 +495,7 @@ def iterateKits(keepOptionsOpen=False, alreadyOnOptionsDialog=False,
if not alreadyOnOptionsDialog:
invokeMenuItem("Tools", "Options...")
waitForObjectItem(":Options_QListView", "Build & Run")
- clickItem(":Options_QListView", "Build & Run", 14, 15, 0, Qt.LeftButton)
+ clickItem(":Options_QListView", "Kits", 14, 15, 0, Qt.LeftButton)
clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Kits")
treeView = waitForObject(":BuildAndRun_QTreeView")
model = treeView.model()
diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index 088d7246f6..72ff89c7e3 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -40,7 +40,7 @@ def main():
if not startedWithoutPluginError():
return
invokeMenuItem("Tools", "Options...")
- __checkBuildAndRun__()
+ __checkKits__()
clickButton(waitForObject(":Options.Cancel_QPushButton"))
invokeMenuItem("File", "Exit")
__checkCreatedSettings__(emptySettings)
@@ -53,9 +53,9 @@ def __createMinimumIni__(emptyParent):
iniFile.write("OverrideLanguage=C\n")
iniFile.close()
-def __checkBuildAndRun__():
- waitForObjectItem(":Options_QListView", "Build & Run")
- clickItem(":Options_QListView", "Build & Run", 14, 15, 0, Qt.LeftButton)
+def __checkKits__():
+ waitForObjectItem(":Options_QListView", "Kits")
+ clickItem(":Options_QListView", "Kits", 14, 15, 0, Qt.LeftButton)
# check compilers
expectedCompilers = __getExpectedCompilers__()
foundCompilers = []