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

SquishTests: Retire Qt 5.4 on Linux

Browse Source 
We never used it on Mac and on Linux it doesn't provide any value. On
Windows it's still the only kit using gcc, so it should not be removed
without a replacement.

Change-Id: I330f8d33a98759a762fd5cc97d5d55e03d1d03d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Löhning
2024-07-25 12:42:55 +02:00
parent 696129296a
commit a1ca3888ba
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/system/README
View File

@@ -18,7 +18,6 @@ Qt version for the respective toolchain with the components (if available):
The exact versions and toolchains are: The exact versions and toolchains are:
Linux: Linux:
Qt 5.4.1 (gcc)
Qt 5.10.1 (gcc) Qt 5.10.1 (gcc)
Qt 5.14.1 (gcc) Qt 5.14.1 (gcc)
Qt 6.2.4 (gcc) Qt 6.2.4 (gcc)

4
tests/system/shared/classes.py
View File

@@ -25,7 +25,7 @@ class Targets:
@staticmethod @staticmethod
def availableTargetClasses(ignoreValidity=False): def availableTargetClasses(ignoreValidity=False):
availableTargets = set(Targets.ALL_TARGETS) availableTargets = set(Targets.ALL_TARGETS)
if platform.system() == 'Darwin': if platform.system() not in ('Windows', 'Microsoft'):
availableTargets.remove(Targets.DESKTOP_5_4_1_GCC) availableTargets.remove(Targets.DESKTOP_5_4_1_GCC)
return availableTargets return availableTargets
@@ -84,7 +84,7 @@ class QtPath:
def getPaths(pathSpec): def getPaths(pathSpec):
qtTargets = [Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT, qtTargets = [Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT,
Targets.DESKTOP_6_2_4] Targets.DESKTOP_6_2_4]
if platform.system() != 'Darwin': if platform.system() in ('Windows', 'Microsoft'):
qtTargets.append(Targets.DESKTOP_5_4_1_GCC) qtTargets.append(Targets.DESKTOP_5_4_1_GCC)
if pathSpec == QtPath.DOCS: if pathSpec == QtPath.DOCS:
return map(lambda target: QtPath.docsPath(target), qtTargets) return map(lambda target: QtPath.docsPath(target), qtTargets)

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

@@ -533,7 +533,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False, ignoreVali
result = result.union(set([Targets.DESKTOP_5_10_1_DEFAULT, result = result.union(set([Targets.DESKTOP_5_10_1_DEFAULT,
Targets.DESKTOP_5_14_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT,
Targets.DESKTOP_6_2_4])) Targets.DESKTOP_6_2_4]))
if platform.system() != 'Darwin': if platform.system() in ('Windows', 'Microsoft'):
result.add(Targets.DESKTOP_5_4_1_GCC) result.add(Targets.DESKTOP_5_4_1_GCC)
elif 'Platform independent' in text: elif 'Platform independent' in text:
result = Targets.desktopTargetClasses() result = Targets.desktopTargetClasses()