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

Squish: Replace Qt 5.3 kit with Qt 5.10

Browse Source 
This patch just changes the minimum for replacing the kits while
keeping the tests running. Further updates to the tests should
be done in separate patches.

Task-number: QTCREATORBUG-19440
Change-Id: I25ce60ad0a47678dba4352a4b2601ca1cdd4741d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2018-03-21 22:21:56 +01:00
parent 17d530d60d
commit fdc4ac41d9
23 changed files with 177 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/classes.py
+12 -12
View File
@@ -32,9 +32,9 @@ class Targets:
(DESKTOP_4_8_7_DEFAULT,
EMBEDDED_LINUX,
DESKTOP_5_3_1_DEFAULT,
DESKTOP_5_4_1_GCC,
DESKTOP_5_6_1_DEFAULT) = ALL_TARGETS
DESKTOP_5_6_1_DEFAULT,
DESKTOP_5_10_1_DEFAULT) = ALL_TARGETS
@staticmethod
def availableTargetClasses():
@@ -62,12 +62,12 @@ class Targets:
return "Desktop 4.8.7 default"
elif target == Targets.EMBEDDED_LINUX:
return "Embedded Linux"
elif target == Targets.DESKTOP_5_3_1_DEFAULT:
return "Desktop 5.3.1 default"
elif target == Targets.DESKTOP_5_4_1_GCC:
return "Desktop 5.4.1 GCC"
elif target == Targets.DESKTOP_5_6_1_DEFAULT:
return "Desktop 5.6.1 default"
elif target == Targets.DESKTOP_5_10_1_DEFAULT:
return "Desktop 5.10.1 default"
else:
return None
@@ -83,7 +83,7 @@ class Targets:
@staticmethod
def getDefaultKit():
return Targets.DESKTOP_5_3_1_DEFAULT
return Targets.DESKTOP_5_6_1_DEFAULT
# this class holds some constants for easier usage inside the Projects view
class ProjectSettings:
@@ -169,7 +169,7 @@ class Qt5Path:
@staticmethod
def getPaths(pathSpec):
qt5targets = [Targets.DESKTOP_5_3_1_DEFAULT, Targets.DESKTOP_5_6_1_DEFAULT]
qt5targets = [Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT]
if platform.system() != 'Darwin':
qt5targets.append(Targets.DESKTOP_5_4_1_GCC)
if pathSpec == Qt5Path.DOCS:
@@ -223,20 +223,20 @@ class Qt5Path:
@staticmethod
def examplesPath(target):
qtMinorVersion, qtPatchVersion = Qt5Path.getQtMinorAndPatchVersion(target)
if qtMinorVersion == 2:
path = "examples"
else:
if qtMinorVersion < 10:
path = "Examples/Qt-5.%d" % qtMinorVersion
else:
path = "Examples/Qt-5.%d.%d" % (qtMinorVersion, qtPatchVersion)
return os.path.join(Qt5Path.__createPlatformQtPath__(qtMinorVersion), path)
@staticmethod
def docsPath(target):
qtMinorVersion, qtPatchVersion = Qt5Path.getQtMinorAndPatchVersion(target)
if qtMinorVersion == 2:
path = "doc"
else:
if qtMinorVersion < 10:
path = "Docs/Qt-5.%d" % qtMinorVersion
else:
path = "Docs/Qt-5.%d.%d" % (qtMinorVersion, qtPatchVersion)
return os.path.join(Qt5Path.__createPlatformQtPath__(qtMinorVersion), path)