Squish: Remove outdated version check

To build Creator, you need Qt 5.6 at least.
To test Qt 5.6 you need Squish 6 at least.

Change-Id: I5b4c08da64df749961544c25f3ed691ff56d2cc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2016-06-08 14:52:05 +02:00
parent b023bedfb0
commit c8e83d0adb
6 changed files with 3 additions and 21 deletions
-4
View File
@@ -665,7 +665,3 @@ def getHelpTitle():
return str(hv.title)
except:
return str(hv.documentTitle)
def canTestEmbeddedQtQuick():
return (squishinfo.major * 0x10000 + squishinfo.minor * 0x100
+ squishinfo.patch) > 0x050100
@@ -51,9 +51,6 @@ def waitForButtonsState(projectsChecked, examplesChecked, tutorialsChecked, time
'and tutoButton.checked == tutorialsChecked', timeout)
def main():
if not canTestEmbeddedQtQuick():
test.log("Welcome mode is not scriptable with this Squish version")
return
global gettingStartedText
# open Qt Creator
startApplication("qtcreator" + SettingsPath)
@@ -34,9 +34,6 @@ def checkTypeAndProperties(typePropertiesDetails):
"Verifying: Qt Creator displays %s." % detail)
def main():
if not canTestEmbeddedQtQuick():
test.log("Welcome mode is not scriptable with this Squish version")
return
# prepare example project
sourceExample = os.path.join(sdkPath, "Examples", "4.7", "declarative", "animation", "basics",
"property-animation")
@@ -41,9 +41,6 @@ def handlePackagingMessageBoxes():
break
def main():
if not canTestEmbeddedQtQuick():
test.log("Welcome mode is not scriptable with this Squish version")
return
global sdkPath
welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
# open Qt Creator
@@ -27,9 +27,6 @@ source("../../shared/qtcreator.py")
source("../../shared/suites_qtta.py")
def main():
if not canTestEmbeddedQtQuick():
test.log("Welcome mode is not scriptable with this Squish version")
return
welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
# open Qt Creator
startApplication("qtcreator" + SettingsPath)
@@ -37,8 +37,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 canTestEmbeddedQtQuick():
checkWelcomePage(sessionName, True)
checkWelcomePage(sessionName, True)
for project in projects:
openQmakeProject(project, Targets.DESKTOP_480_DEFAULT)
progressBarWait(20000)
@@ -50,9 +49,8 @@ def main():
switchSession("default")
test.verify(waitFor("'Qt Creator' == str(mainWindow.windowTitle)", 2000),
"Verifying window title is set to default.")
if canTestEmbeddedQtQuick():
checkWelcomePage(sessionName, False)
switchViewTo(ViewConstants.EDIT)
checkWelcomePage(sessionName, False)
switchViewTo(ViewConstants.EDIT)
checkNavigator(1, "Verifying that no more project is opened.")
checkOpenDocuments(0, "Verifying whether all files have been closed.")
switchSession(sessionName)