From aa0d68ec3e0d8165548b4136768168cbb08c51c2 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 18 Jun 2015 13:58:27 +0200 Subject: [PATCH] Squish: Remove compatibility code for Qt 5.3 Creator 3.5 needs Qt 5.4 at least. Change-Id: Ie37447ff612cc7294cbd8dcca17e81997e4f9328 Reviewed-by: Christian Stenger --- tests/system/shared/qtcreator.py | 2 -- tests/system/suite_HELP/tst_HELP06/test.py | 11 ++++------- tests/system/suite_WELP/tst_WELP01/test.py | 9 ++------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index eec70a2a8f4..ff3d58afec6 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -39,8 +39,6 @@ import sys import errno; from datetime import datetime,timedelta; -isQt53Build = os.getenv("SYSTEST_ISQT53BUILD") != "0" - srcPath = '' SettingsPath = '' tmpSettingsDir = '' diff --git a/tests/system/suite_HELP/tst_HELP06/test.py b/tests/system/suite_HELP/tst_HELP06/test.py index fd71d6487ac..0ff775790e8 100755 --- a/tests/system/suite_HELP/tst_HELP06/test.py +++ b/tests/system/suite_HELP/tst_HELP06/test.py @@ -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) diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index c63b3ecf808..825985d3ba0 100755 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -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',