diff --git a/tests/system/objects.map b/tests/system/objects.map index 8001ac4392abae3f77c4d3d484a94fab13c117e2..523991e592a6c2fd585d44e44623b5a0ac434590 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -38,6 +38,7 @@ :Qt Gui Application_Qt4ProjectManager::Internal::GuiAppWizardDialog {type='Qt4ProjectManager::Internal::GuiAppWizardDialog' unnamed='1' visible='1' windowTitle='Qt Gui Application'} :QtCreator.MenuBar_ProjectExplorer::Internal::MiniProjectTargetSelector {type='ProjectExplorer::Internal::MiniProjectTargetSelector'} :QtCreator.MenuBar_ProjectExplorer::Internal::ProjectListWidget {type='ProjectExplorer::Internal::ProjectListWidget' window=':QtCreator.MenuBar_ProjectExplorer::Internal::MiniProjectTargetSelector'} +:addToVersionControlComboBox_QComboBox {name='addToVersionControlComboBox' type='QComboBox' visible='1'} :formFileLineEdit_Utils::FileNameValidatingLineEdit {buddy=':Qt Gui Application.Form file:_QLabel' name='formFileLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1'} :frame.nameLineEdit_Utils::ProjectNameValidatingLineEdit {container=':Qt Gui Application.frame_QFrame' name='nameLineEdit' type='Utils::ProjectNameValidatingLineEdit' visible='1'} :frame_Utils::BaseValidatingLineEdit {container=':Qt Gui Application.frame_QFrame' type='Utils::BaseValidatingLineEdit' unnamed='1' visible='1'} diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 21194ca859493ed7b0f04bf994f806f154840ab2..ee7301b3e61b13974765ed2061847a2ecfda65b3 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -112,6 +112,7 @@ def createProject_Qt_GUI(path, projectName, qtVersion, checks): test.verify(ui_found > cpp_found, "'" + ui_file + "' found at index " + str(ui_found)) test.verify(pro_found > ui_found, "'" + pro_file + "' found at index " + str(pro_found)) + selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>") clickButton(waitForObject(":Qt Gui Application.Finish_QPushButton")) if checks: @@ -159,4 +160,5 @@ def createNewQtQuickApplication(workingDir, projectName = None, templateFile = N chooseDestination(destination) snooze(1) clickButton(nextButton) + selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>") clickButton(waitForObject("{type='QPushButton' text~='(Finish|Done)' visible='1'}", 20000)) diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index 37e976aca5b5ab8b27b6bd4e85360cba29b63d74..e7c191f74c298a334d74043e48c7e7f120f3b062 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -30,6 +30,7 @@ def createNewQtQuickUI(): clickButton(cbDefaultLocation) # now there's the 'untitled' project inside a temporary directory - step forward...! clickButton(waitForObject("{text~='(Next.*|Continue)' type='QPushButton' visible='1'}", 20000)) + selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>") clickButton(waitForObject("{type='QPushButton' text~='(Finish|Done)' visible='1'}", 20000)) def cleanup(): diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py index 0dfa6e64049040659f20c25d3a8141a51b9dfffa..1861aa25583fcfecb9adacc0b8f86e699d6c674b 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py @@ -45,6 +45,7 @@ def createNewQmlExtension(): "type='QLineEdit' unnamed='1' visible='1'}", 20000) replaceEditorContent(uriLineEd, "com.nokia.test.qmlcomponents") clickButton(nextButton) + selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>") clickButton(waitForObject("{type='QPushButton' text~='(Finish|Done)' visible='1'}", 20000)) def cleanup():