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

Squish: Close Link with Qt banner at startup

Browse Source 
Change-Id: I02e9a1b4eecc21804a2570a72cbdc0b19ae4f7a1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2020-01-27 10:28:24 +01:00
parent 5dcd9685f9
commit 51cc14c738
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ def startCreatorVerifyingClang(useClang):
try: try:
# start Qt Creator with / without enabled ClangCodeModel plugin (without modifying settings) # start Qt Creator with / without enabled ClangCodeModel plugin (without modifying settings)
loadOrNoLoad = '-load' if useClang else '-noload' loadOrNoLoad = '-load' if useClang else '-noload'
startQC([loadOrNoLoad, 'ClangCodeModel'], cancelTour=firstStart) startQC([loadOrNoLoad, 'ClangCodeModel'], closeLinkToQt=firstStart, cancelTour=firstStart)
firstStart = False firstStart = False
except RuntimeError: except RuntimeError:
t, v = sys.exc_info()[:2] t, v = sys.exc_info()[:2]

4
tests/system/shared/qtcreator.py
View File

@@ -55,7 +55,7 @@ source("../../shared/welcome.py")
source("../../shared/workarounds.py") # include this at last source("../../shared/workarounds.py") # include this at last
# additionalParameters must be a list or tuple of strings or None # 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 global SettingsPath
appWithOptions = ['"Qt Creator"' if platform.system() == 'Darwin' else "qtcreator"] appWithOptions = ['"Qt Creator"' if platform.system() == 'Darwin' else "qtcreator"]
if withPreparedSettingsPath: if withPreparedSettingsPath:
@@ -66,6 +66,8 @@ def startQC(additionalParameters=None, withPreparedSettingsPath=True, cancelTour
appWithOptions.extend(('-platform', 'windows:dialogs=none')) appWithOptions.extend(('-platform', 'windows:dialogs=none'))
test.log("Starting now: %s" % ' '.join(appWithOptions)) test.log("Starting now: %s" % ' '.join(appWithOptions))
appContext = startApplication(' '.join(appWithOptions)) appContext = startApplication(' '.join(appWithOptions))
if closeLinkToQt:
clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton"))
if cancelTour: if cancelTour:
clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton")) clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton"))
return appContext; return appContext;

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

@@ -45,7 +45,7 @@ def main():
invokeMenuItem("File", "Exit") invokeMenuItem("File", "Exit")
waitForCleanShutdown() waitForCleanShutdown()
snooze(4) # wait for complete unloading of Creator snooze(4) # wait for complete unloading of Creator
startQC(cancelTour=False) startQC(closeLinkToQt=False, cancelTour=False)
try: try:
# Use Locator for menu items which wouldn't work on macOS # Use Locator for menu items which wouldn't work on macOS
exitCommand = testData.field(lang, "Exit") exitCommand = testData.field(lang, "Exit")