forked from qt-creator/qt-creator
Squish: Close Link with Qt banner at startup
Change-Id: I02e9a1b4eecc21804a2570a72cbdc0b19ae4f7a1 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
This commit is contained in:
@@ -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]
|
||||
|
@@ -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;
|
||||
|
@@ -45,7 +45,7 @@ def main():
|
||||
invokeMenuItem("File", "Exit")
|
||||
waitForCleanShutdown()
|
||||
snooze(4) # wait for complete unloading of Creator
|
||||
startQC(cancelTour=False)
|
||||
startQC(closeLinkToQt=False, cancelTour=False)
|
||||
try:
|
||||
# Use Locator for menu items which wouldn't work on macOS
|
||||
exitCommand = testData.field(lang, "Exit")
|
||||
|
Reference in New Issue
Block a user