diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2020-02-06 21:05:01 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2020-03-10 15:59:08 +0000 |
| commit | aac77eecb97d49b91bf063a6da324107ffc71aaa (patch) | |
| tree | 738f96a5e3c4636615a02040f29cf9ff26505620 /tests/system/shared | |
| parent | 4e4b8965a9358143a6e75afe4dc1b4a949491df1 (diff) | |
Squish: Replace Qt version 5.6.1 with 5.14.1
Task-number: QTCREATORBUG-22111
Change-Id: Iaae052e73a264252e399bd0992be4b420e2799ae
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/system/shared')
| -rw-r--r-- | tests/system/shared/classes.py | 12 | ||||
| -rw-r--r-- | tests/system/shared/project.py | 13 |
2 files changed, 11 insertions, 14 deletions
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index 90bbe4d796..3a675c61e5 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -32,15 +32,15 @@ class Targets: (DESKTOP_4_8_7_DEFAULT, EMBEDDED_LINUX, DESKTOP_5_4_1_GCC, - DESKTOP_5_6_1_DEFAULT, - DESKTOP_5_10_1_DEFAULT) = ALL_TARGETS + DESKTOP_5_10_1_DEFAULT, + DESKTOP_5_14_1_DEFAULT) = ALL_TARGETS __TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS, ["Desktop 4.8.7 default", "Embedded Linux", "Desktop 5.4.1 GCC", - "Desktop 5.6.1 default", - "Desktop 5.10.1 default"])) + "Desktop 5.10.1 default", + "Desktop 5.14.1 default"])) @staticmethod def availableTargetClasses(): @@ -71,7 +71,7 @@ class Targets: @staticmethod def getDefaultKit(): - return Targets.DESKTOP_5_6_1_DEFAULT + return Targets.DESKTOP_5_14_1_DEFAULT # this class holds some constants for easier usage inside the Projects view class ProjectSettings: @@ -106,7 +106,7 @@ class Qt5Path: @staticmethod def getPaths(pathSpec): - qt5targets = [Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT] + qt5targets = [Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT] if platform.system() != 'Darwin': qt5targets.append(Targets.DESKTOP_5_4_1_GCC) if pathSpec == Qt5Path.DOCS: diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 39cdda4351..96b79a5c4a 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -278,7 +278,7 @@ def createProject_Qt_Console(path, projectName, checks = True, buildSystem = Non __verifyFileCreation__(path, expectedFiles) def createNewQtQuickApplication(workingDir, projectName=None, - targets=Targets.desktopTargetClasses(), minimumQtVersion="5.6", + targets=Targets.desktopTargetClasses(), minimumQtVersion="5.10", template="Qt Quick Application - Empty", fromWelcome=False, buildSystem=None): available = __createProjectOrFileSelectType__(" Application (Qt Quick)", template, fromWelcome) @@ -298,7 +298,7 @@ def createNewQtQuickApplication(workingDir, projectName=None, return checkedTargets, projectName -def createNewQtQuickUI(workingDir, qtVersion = "5.6"): +def createNewQtQuickUI(workingDir, qtVersion = "5.10"): available = __createProjectOrFileSelectType__(" Other Project", 'Qt Quick UI Prototype') if workingDir == None: workingDir = tempDir() @@ -316,7 +316,7 @@ def createNewQtQuickUI(workingDir, qtVersion = "5.6"): return checkedTargets, projectName -def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_5_6_1_DEFAULT]): +def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_5_14_1_DEFAULT]): available = __createProjectOrFileSelectType__(" Library", "Qt Quick 2 Extension Plugin") if workingDir == None: workingDir = tempDir() @@ -505,10 +505,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): else: version = None if templateName.startswith("Qt Quick Application - "): - if templateName == "Qt Quick Application - Empty": - result = set([Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT]) - else: - result = set([Targets.DESKTOP_5_10_1_DEFAULT]) + result = set([Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT]) elif 'Supported Platforms' in text: supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ") result = set() @@ -517,7 +514,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): result.add(Targets.DESKTOP_4_8_7_DEFAULT) if platform.system() in ("Linux", "Darwin"): result.add(Targets.EMBEDDED_LINUX) - result = result.union(set([Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT])) + result = result.union(set([Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT])) if platform.system() != 'Darwin': result.add(Targets.DESKTOP_5_4_1_GCC) elif 'Platform independent' in text: |