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

Squish: Replace Qt version 5.6.1 with 5.14.1

Browse Source 
Task-number: QTCREATORBUG-22111
Change-Id: Iaae052e73a264252e399bd0992be4b420e2799ae
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2020-02-06 21:05:01 +01:00
parent 4e4b8965a9
commit aac77eecb9
31 changed files with 100 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/classes.py
+6 -6
View File
@@ -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: