forked from qt-creator/qt-creator
SquishTests: Remove duplicate object
Change-Id: I7ceed8ef40684323b8404c3fe7c529fbd5b7be74 Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
@@ -92,7 +92,6 @@
|
||||
:JsonWizard_ProjectExplorer::JsonFieldPage {type='ProjectExplorer::JsonFieldPage' unnamed='1' visible='1' window=':New_ProjectExplorer::JsonWizard'}
|
||||
:Kits_QtVersion_QComboBox {container=':qt_tabwidget_stackedwidget_QWidget' leftWidget=':QtVersionLabel_KitPage' type='QComboBox' unnamed='1' visible='1'}
|
||||
:Locals and Expressions_Debugger::Internal::WatchTreeView {container=':Debugger.Docks.LocalsAndWatchersDockWidget.Inspector_QFrame' name='WatchWindow' type='Debugger::Internal::WatchTreeView' visible='1'}
|
||||
:New Text File.Add to project:_QLabel {name='projectLabel' text='Add to project:' type='QLabel' visible='1' window=':New_ProjectExplorer::JsonWizard'}
|
||||
:New Text File.nameLineEdit_Utils::FileNameValidatingLineEdit {name='nameLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1' window=':New_ProjectExplorer::JsonWizard'}
|
||||
:New.comboBox_QComboBox {type='QComboBox' unnamed='1' visible='1' window=':New_Core::Internal::NewDialog'}
|
||||
:New.templateCategoryView_QTreeView {name='templateCategoryView' type='QTreeView' visible='1' window=':New_Core::Internal::NewDialog'}
|
||||
@@ -205,8 +204,7 @@
|
||||
:headerFileLineEdit_Utils::FileNameValidatingLineEdit {name='HdrFileName' type='Utils::FancyLineEdit' visible='1' window=':New_ProjectExplorer::JsonWizard'}
|
||||
:popupFrame_Proposal_QListView {container=':popupFrame_TextEditor::GenericProposalWidget' type='QListView' unnamed='1' visible='1'}
|
||||
:popupFrame_TextEditor::GenericProposalWidget {name='m_popupFrame' type='TextEditor::GenericProposalWidget' visible='1'}
|
||||
:projectComboBox_QComboBox {buddy=':New Text File.Add to project:_QLabel' name='projectComboBox' type='QComboBox' visible='1'}
|
||||
:projectComboBox_Utils::TreeViewComboBox {buddy=':New Text File.Add to project:_QLabel' name='projectComboBox' type='QComboBox' visible='1'}
|
||||
:projectComboBox_QComboBox {name='projectComboBox' type='QComboBox' visible='1'}
|
||||
:qdesigner_internal::WidgetBoxCategoryListView {container=':Widget Box_qdesigner_internal::WidgetBoxTreeWidget' occurrence='3' type='qdesigner_internal::WidgetBoxCategoryListView' unnamed='1' visible='1'}
|
||||
:qt_tabwidget_stackedwidget.QtSupport__Internal__QtVersionManager_QtSupport::Internal::QtOptionsPageWidget {container=':Options.qt_tabwidget_stackedwidget_QStackedWidget' type='QScrollArea' unnamed='1' visible='1'}
|
||||
:qt_tabwidget_stackedwidget_QScrollArea {container=':Options.qt_tabwidget_stackedwidget_QStackedWidget' type='QScrollArea' unnamed='1' visible='1'}
|
||||
|
@@ -662,7 +662,7 @@ def addCPlusPlusFile(name, template, projectName, forceOverwrite=False, addToVCS
|
||||
test.compare(str(waitForObject("{name='HdrFileName' type='QLineEdit' visible='1'}").text),
|
||||
expectedHeaderName)
|
||||
clickButton(waitForObject(":Next_QPushButton"))
|
||||
projectComboBox = waitForObjectExists(":projectComboBox_Utils::TreeViewComboBox")
|
||||
projectComboBox = waitForObjectExists(":projectComboBox_QComboBox")
|
||||
test.compare(projectComboBox.enabled, projectName != None,
|
||||
"Project combo box must be enabled when a project is open")
|
||||
projectNameToDisplay = "<None>"
|
||||
|
@@ -14,8 +14,7 @@ def addFileToProject(projectPath, category, fileTemplate, fileName):
|
||||
projectPath, "Verifying whether path is correct."):
|
||||
replaceEditorContent(pathLineEdit, projectPath)
|
||||
clickButton(waitForObject(":Next_QPushButton"))
|
||||
projCombo = findObject("{buddy={name='projectLabel' text='Add to project:' type='QLabel' "
|
||||
"visible='1'} name='projectComboBox' type='QComboBox' visible='1'}")
|
||||
projCombo = waitForObjectExists(":projectComboBox_QComboBox", 1000)
|
||||
proFileName = os.path.basename(projectPath) + ".pro"
|
||||
test.verify(not selectFromCombo(projCombo, proFileName), "Verifying project is selected.")
|
||||
__createProjectHandleLastPage__()
|
||||
|
Reference in New Issue
Block a user