diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-01-27 10:28:24 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-01-27 14:38:24 +0000 |
| commit | 51cc14c738748d359df34e2bd1154b1a2da0df1c (patch) | |
| tree | 7e0ec0479268edcb09f0d7afafca52acb48f2208 /tests/system/shared | |
| parent | 5dcd9685f9515f5a07fba210fd3bbc7737ed2d3c (diff) | |
Squish: Close Link with Qt banner at startup
Change-Id: I02e9a1b4eecc21804a2570a72cbdc0b19ae4f7a1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Diffstat (limited to 'tests/system/shared')
| -rw-r--r-- | tests/system/shared/clang.py | 2 | ||||
| -rw-r--r-- | tests/system/shared/qtcreator.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/system/shared/clang.py b/tests/system/shared/clang.py index 99bb1b6f94..cccafa8a20 100644 --- a/tests/system/shared/clang.py +++ b/tests/system/shared/clang.py @@ -30,7 +30,7 @@ def startCreatorVerifyingClang(useClang): try: # start Qt Creator with / without enabled ClangCodeModel plugin (without modifying settings) loadOrNoLoad = '-load' if useClang else '-noload' - startQC([loadOrNoLoad, 'ClangCodeModel'], cancelTour=firstStart) + startQC([loadOrNoLoad, 'ClangCodeModel'], closeLinkToQt=firstStart, cancelTour=firstStart) firstStart = False except RuntimeError: t, v = sys.exc_info()[:2] diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 7d2a45490a..295a9ed2cf 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, cancelTour=True): +def startQC(additionalParameters=None, withPreparedSettingsPath=True, closeLinkToQt=True, cancelTour=True): global SettingsPath appWithOptions = ['"Qt Creator"' if platform.system() == 'Darwin' else "qtcreator"] if withPreparedSettingsPath: @@ -66,6 +66,8 @@ def startQC(additionalParameters=None, withPreparedSettingsPath=True, cancelTour appWithOptions.extend(('-platform', 'windows:dialogs=none')) test.log("Starting now: %s" % ' '.join(appWithOptions)) appContext = startApplication(' '.join(appWithOptions)) + if closeLinkToQt: + clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton")) if cancelTour: clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton")) return appContext; |