Squish: Remove compatibility code for Qt 5.3

Creator 3.5 needs Qt 5.4 at least.

Change-Id: Ie37447ff612cc7294cbd8dcca17e81997e4f9328
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-06-18 13:58:27 +02:00
parent 92ec05c9bd
commit aa0d68ec3e
3 changed files with 6 additions and 16 deletions

View File

@@ -39,8 +39,6 @@ import sys
import errno;
from datetime import datetime,timedelta;
isQt53Build = os.getenv("SYSTEST_ISQT53BUILD") != "0"
srcPath = ''
SettingsPath = ''
tmpSettingsDir = ''

View File

@@ -45,13 +45,10 @@ def invokeContextMenuItemOnBookmarkFolder(view, item, menuItem):
"window=':Add Bookmark_BookmarkDialog'}" % aboveWidget), menuItem)
def textForQtVersion(text):
if isQt53Build:
return text + " | QtCreator"
else:
suffix = "Qt Creator Manual"
if text != suffix:
text += " | " + suffix
return text
suffix = "Qt Creator Manual"
if text != suffix:
text += " | " + suffix
return text
def main():
startApplication("qtcreator" + SettingsPath)

View File

@@ -83,13 +83,8 @@ def main():
test.verify(checkIfObjectExists(gettingStartedText),
"Verifying: Qt Creator displays Welcome Page with 'Get Started Now' button.")
if isQt53Build:
expectedText = "(QtCreator : Qt Creator Manual)|(Qt Creator Manual [|] QtCreator)"
else:
expectedText = "Qt Creator Manual"
testDetails = "Verifying: Help with Creator Documentation is being opened."
clickItemVerifyHelpCombo(gettingStartedText, expectedText, testDetails)
clickItemVerifyHelpCombo(gettingStartedText, "Qt Creator Manual",
"Verifying: Help with Creator Documentation is being opened.")
textUrls = {'Online Community':'http://forum.qt.io',
'Blogs':'http://planet.qt.io',
'Qt Account':'https://account.qt.io',