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

Squish: Remove compatibility code for Qt 5.3

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/shared/qtcreator.py
View File

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

3
tests/system/suite_HELP/tst_HELP06/test.py
View File

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

9
tests/system/suite_WELP/tst_WELP01/test.py
View File

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