Commit 9b893797 authored by Christian Stenger's avatar Christian Stenger

Squish: Revive WELP01 for Squish 5.1.1+

Change-Id: I1d1bc9334fe6c0fc1187b9bcde27d0b4ed3081b4
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
parent aadc3804
......@@ -88,6 +88,10 @@ def checkIfObjectItemExists(object, item, timeout = 3000):
def getQmlItem(type, container, clip, text=""):
if (container.startswith(":")):
container = "'%s'" % container
clip = ("%s" % __builtin__.bool(clip)).lower()
return ("{clip='%s' container=%s enabled='true' %s type='%s' unnamed='1' visible='true'}"
% (clip, container, text, type))
\ No newline at end of file
if clip != None:
clip = ("%s" % __builtin__.bool(clip)).lower()
return ("{clip='%s' container=%s enabled='true' %s type='%s' unnamed='1' visible='true'}"
% (clip, container, text, type))
else:
return ("{container=%s enabled='true' %s type='%s' unnamed='1' visible='true'}"
% (container, text, type))
......@@ -540,7 +540,7 @@ def setAlwaysStartFullHelp():
waitForObjectItem(":Options_QListView", "Help")
clickItem(":Options_QListView", "Help", 5, 5, 0, Qt.LeftButton)
clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "General")
selectFromCombo(":Startup.contextHelpComboBox_QComboBox", "Always Start Full Help")
selectFromCombo(":Startup.contextHelpComboBox_QComboBox", "Always Show in Help Mode")
clickButton(waitForObject(":Options.OK_QPushButton"))
def removePackagingDirectory(projectPath):
......@@ -674,3 +674,7 @@ def getHelpTitle():
return str(hv.title)
except:
return str(hv.documentTitle)
def canTestEmbeddedQtQuick():
return (squishinfo.major * 0x10000 + squishinfo.minor * 0x100
+ squishinfo.patch) > 0x050100
This diff is collapsed.
......@@ -29,10 +29,6 @@
source("../../shared/qtcreator.py")
def canTestQtQuick():
return (squishinfo.major * 0x10000 + squishinfo.minor * 0x100
+ squishinfo.patch) > 0x050100
def main():
projects = prepareTestExamples()
if not projects:
......@@ -45,7 +41,7 @@ def main():
mainWindow = waitForObject(":Qt Creator_Core::Internal::MainWindow")
test.verify(waitFor("sessionName in str(mainWindow.windowTitle)", 2000),
"Verifying window title contains created session name.")
if not isQt4Build and canTestQtQuick():
if not isQt4Build and canTestEmbeddedQtQuick():
checkWelcomePage(sessionName, True)
for project in projects:
openQmakeProject(project, Targets.DESKTOP_480_GCC)
......@@ -58,7 +54,7 @@ def main():
switchSession("default")
test.verify(waitFor("'Qt Creator' == str(mainWindow.windowTitle)", 2000),
"Verifying window title is set to default.")
if not isQt4Build and canTestQtQuick():
if not isQt4Build and canTestEmbeddedQtQuick():
checkWelcomePage(sessionName, False)
switchViewTo(ViewConstants.EDIT)
checkNavigator(1, "Verifying that no more project is opened.")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment