diff --git a/tests/system/objects.map b/tests/system/objects.map index c5f1ac43733..b3852a89eab 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -196,6 +196,8 @@ :Send to Codepaster_CodePaster::PasteView {name='CodePaster__Internal__ViewDialog' type='CodePaster::PasteView' visible='1' windowTitle='Send to Codepaster'} :Session Manager_ProjectExplorer::Internal::SessionDialog {name='ProjectExplorer__Internal__SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'} :Startup.contextHelpComboBox_QComboBox {container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'} +:Take a UI Tour.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':Take a UI Tour_Utils::CheckableMessageBox'} +:Take a UI Tour_Utils::CheckableMessageBox {type='Utils::CheckableMessageBox' unnamed='1' visible='1' windowTitle='Take a UI Tour'} :User Interface.languageBox_QComboBox {container=':Core__Internal__GeneralSettings.User Interface_QGroupBox' name='languageBox' type='QComboBox' visible='1'} :Widget Box_qdesigner_internal::WidgetBoxTreeWidget {container=':*Qt Creator.Widget Box_QDockWidget' type='qdesigner_internal::WidgetBoxTreeWidget' unnamed='1' visible='1'} :Working Copy_Utils::BaseValidatingLineEdit {type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':New Text File_ProjectExplorer::JsonWizard'} diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index cd572a4a794..4b909c6e441 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: diff --git a/tests/system/suite_general/tst_installed_languages/test.py b/tests/system/suite_general/tst_installed_languages/test.py index 4685ef2083d..a6e104ceb31 100644 --- a/tests/system/suite_general/tst_installed_languages/test.py +++ b/tests/system/suite_general/tst_installed_languages/test.py @@ -46,7 +46,7 @@ def main(): invokeMenuItem("File", "Exit") waitForCleanShutdown() snooze(4) # wait for complete unloading of Creator - startQC() + startQC(cancelTour=False) try: # Use Locator for menu items which wouldn't work on macOS exitCommand = testData.field(lang, "Exit")