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

Squish: Fix remaining WELP tests for Qt 5.5

Browse Source 
Change-Id: Ibe0df94d833ac2a10d43884ada3c1fe3d5de0b98
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-07-27 16:14:08 +02:00
parent bbb260093a
commit c70502d691
5 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/project.py
+14 -2
View File
@@ -39,7 +39,13 @@ def openQbsProject(projectPath):
def openQmakeProject(projectPath, targets=Targets.desktopTargetClasses(), fromWelcome=False):
cleanUpUserFiles(projectPath)
if fromWelcome:
mouseClick(waitForObject(":OpenProject_QStyleItem"), 5, 5, 0, Qt.LeftButton)
if isQt54Build:
welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
else:
welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
mouseClick(waitForObject("{clip='false' container='%s' enabled='true' text='Open Project' "
"type='Button' unnamed='1' visible='true'}" % welcomePage),
5, 5, 0, Qt.LeftButton)
else:
invokeMenuItem("File", "Open File or Project...")
selectFromFileDialog(projectPath)
@@ -94,7 +100,13 @@ def __handleCmakeWizardPage__():
# this list can be used in __chooseTargets__()
def __createProjectOrFileSelectType__(category, template, fromWelcome = False, isProject=True):
if fromWelcome:
mouseClick(waitForObject(":CreateProject_QStyleItem"), 5, 5, 0, Qt.LeftButton)
if isQt54Build:
welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
else:
welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
mouseClick(waitForObject("{clip='false' container='%s' enabled='true' text='New Project' "
"type='Button' unnamed='1' visible='true'}" % welcomePage),
5, 5, 0, Qt.LeftButton)
else:
invokeMenuItem("File", "New File or Project...")
categoriesView = waitForObject(":New.templateCategoryView_QTreeView")