aboutsummaryrefslogtreecommitdiffstats
path: root/tests/system/shared
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2019-02-04 13:49:14 +0100
committerRobert Loehning <robert.loehning@qt.io>2019-02-04 14:20:56 +0000
commit2cb872a19295339334a30849ddb8d1ba56f63189 (patch)
tree1134738b6e0f0b62ad01c92c928a7b74c2beb8ed /tests/system/shared
parent99a883527b6f817688d6e974a265c1c96784d638 (diff)
Squish: Close "Take a tour" popup after startup
Change-Id: Ie5edf4a3a9a90b52e3a5e74e7e17e2bd66c38841 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/system/shared')
-rw-r--r--tests/system/shared/qtcreator.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index cd572a4a79..4b909c6e44 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -55,7 +55,7 @@ source("../../shared/welcome.py")
source("../../shared/workarounds.py") # include this at last
# additionalParameters must be a list or tuple of strings or None
-def startQC(additionalParameters=None, withPreparedSettingsPath=True):
+def startQC(additionalParameters=None, withPreparedSettingsPath=True, cancelTour=True):
global SettingsPath
appWithOptions = ['"Qt Creator"' if platform.system() == 'Darwin' else "qtcreator"]
if withPreparedSettingsPath:
@@ -65,7 +65,10 @@ def startQC(additionalParameters=None, withPreparedSettingsPath=True):
if platform.system() in ('Microsoft', 'Windows'): # for hooking into native file dialog
appWithOptions.extend(('-platform', 'windows:dialogs=none'))
test.log("Starting now: %s" % ' '.join(appWithOptions))
- return startApplication(' '.join(appWithOptions))
+ appContext = startApplication(' '.join(appWithOptions))
+ if cancelTour:
+ clickButton(waitForObject(":Take a UI Tour.Cancel_QPushButton"))
+ return appContext;
def startedWithoutPluginError():
try: