aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2014-07-28 16:01:11 +0200
committerRobert Loehning <robert.loehning@digia.com>2014-07-29 18:15:05 +0200
commited9261733bd752e061cfa1fb3d443a80cb4d0b4e (patch)
tree46c1b1b0e9a2f2556532aa564cc752d9517c6277
parent31463402112113e7d5a3297a503b3e56f443f68d (diff)
Squish: Replace Qt 5.0 by Qt 5.3
Change-Id: I2fb5ea259c523fce4e71f02ca087ed93fd9a0ae1 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Diffstat
-rw-r--r--tests/system/README12
-rw-r--r--tests/system/settings/mac/QtProject/qtcreator/profiles.xml17
-rw-r--r--tests/system/settings/mac/QtProject/qtcreator/qtversion.xml14
-rw-r--r--tests/system/settings/unix/QtProject/qtcreator/profiles.xml17
-rw-r--r--tests/system/settings/unix/QtProject/qtcreator/qtversion.xml14
-rw-r--r--tests/system/settings/windows/QtProject/qtcreator/profiles.xml10
-rw-r--r--tests/system/settings/windows/QtProject/qtcreator/qtversion.xml14
-rw-r--r--tests/system/shared/classes.py16
-rw-r--r--tests/system/shared/project.py10
-rwxr-xr-xtests/system/suite_CCOM/tst_CCOM01/test.py2
-rwxr-xr-xtests/system/suite_CCOM/tst_CCOM02/test.py2
-rw-r--r--tests/system/suite_debugger/tst_qml_locals/test.py2
-rw-r--r--tests/system/suite_qtquick/tst_qtquick_creation4/test.py4
13 files changed, 77 insertions, 57 deletions
diff --git a/tests/system/README b/tests/system/README
index c1c18284d9..c220aa5267 100644
--- a/tests/system/README
+++ b/tests/system/README
@@ -11,8 +11,8 @@ On Linux/Mac this is ~/QtSDK, and on Windows this is C:\QtSDK.
After installing the QtSDK you should use the package manager of the QtSDK (SDKMaintenanceTool) to add some more packages.
You'll need at least Desktop Qt versions 4.7.4, 4.8.0, Harmattan stuff (except QEmu), Maemo Toolchain, Qt Examples, Simulator, Documentation files.
-Third - some of the test suites/test cases expect Qt 5.0.1 and Qt 5.2.1 installed in its default location.
-On Linux/Mac this is ~/Qt5.0.1 or ~/Qt5.2.1, and on Windows this is C:\Qt\Qt5.0.1 or C:\Qt\Qt5.2.1.
+Third - some of the test suites/test cases expect Qt 5.2.1 and Qt 5.3.1 installed in its default location.
+On Linux/Mac this is ~/Qt5.2.1 or ~/Qt5.3.1, and on Windows this is C:\Qt\Qt5.2.1 or C:\Qt\Qt5.3.1.
Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below).
These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on).
@@ -32,6 +32,14 @@ Normally it should be okay to just install them as usual and add their executabl
Attention! If any of these prerequisites cannot be satisfied the tests will likely fail (or not run at all).
+Prerequisites - testing on Qt4
+------------------------------
+If you want to test a Qt Creator based on Qt4, you should make sure that your build of Qt contains the change
+98530cbc3a0bbb633bab96eebb535d7f92ecb1fa
+Qt 4.8.7 will contain this change.
+Additionally, you'll have to set the variable isQt4Build to "True" in shared/classes.py.
+
+
Prerequisites - hooking into subprocesses
-----------------------------------------
The usage of the hook-into subprocess has following prerequisites:
diff --git a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml
index dacc8f46ce..ca971e6011 100644
--- a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles>
-<!-- Written by QtCreator 2.8.82, 2013-10-24T18:43:10. -->
+<!-- Written by QtCreator 3.1.84, 2014-07-28T14:22:51. -->
<qtcreator>
<data>
<variable>Profile.0</variable>
@@ -111,6 +111,7 @@
<variable>Profile.5</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
+ <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{2f514661-b9f7-4f83-8822-a9a9d0699600}</value>
@@ -119,13 +120,14 @@
<value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Clang:{6afe7dea-8caa-424e-b370-b7b0a34015fb}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
- <value type="int" key="QtSupport.QtInformation">7</value>
+ <value type="int" key="QtSupport.QtInformation">9</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
- <value type="QString" key="PE.Profile.Id">{9c58fcfd-9e49-4a08-971f-a677dc9ce185}</value>
+ <value type="QString" key="PE.Profile.Id">{fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
- <value type="QString" key="PE.Profile.Name">Desktop 501 default</value>
+ <value type="QString" key="PE.Profile.Name">Desktop 521 default</value>
<value type="bool" key="PE.Profile.SDK">false</value>
+ <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap>
</data>
<data>
@@ -162,13 +164,14 @@
<value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Clang:{6afe7dea-8caa-424e-b370-b7b0a34015fb}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
- <value type="int" key="QtSupport.QtInformation">9</value>
+ <value type="int" key="QtSupport.QtInformation">11</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
- <value type="QString" key="PE.Profile.Id">{fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a}</value>
+ <value type="QString" key="PE.Profile.Id">{a1e860d1-c241-4abf-80fe-cf0c9f0a43b3}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
- <value type="QString" key="PE.Profile.Name">Desktop 521 default</value>
+ <value type="QString" key="PE.Profile.Name">Desktop 531 default</value>
<value type="bool" key="PE.Profile.SDK">false</value>
+ <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap>
</data>
<data>
diff --git a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml
index 9dd3b5f076..941d0cac12 100644
--- a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml
+++ b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorQtVersions>
-<!-- Written by Qt Creator 2.5.81, 2012-06-27T15:58:50. -->
+<!-- Written by Qt Creator 3.1.84, 2014-07-28T14:22:16. -->
<qtcreator>
<data>
<variable>QtVersion.0</variable>
@@ -55,9 +55,9 @@
<data>
<variable>QtVersion.5</variable>
<valuemap type="QVariantMap">
- <value type="int" key="Id">7</value>
- <value type="QString" key="Name">Desktop Qt 5.0.1 (SQUISH_DEFAULT_COMPILER)</value>
- <value type="QString" key="QMakePath">~/Qt5.0.1/5.0.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
+ <value type="int" key="Id">9</value>
+ <value type="QString" key="Name">Desktop Qt 5.2.1 (SQUISH_DEFAULT_COMPILER)</value>
+ <value type="QString" key="QMakePath">~/Qt5.2.1/5.2.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
@@ -65,9 +65,9 @@
<data>
<variable>QtVersion.6</variable>
<valuemap type="QVariantMap">
- <value type="int" key="Id">9</value>
- <value type="QString" key="Name">Desktop Qt 5.2.1 (SQUISH_DEFAULT_COMPILER)</value>
- <value type="QString" key="QMakePath">~/Qt5.2.1/5.2.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
+ <value type="int" key="Id">11</value>
+ <value type="QString" key="Name">Desktop Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value>
+ <value type="QString" key="QMakePath">~/Qt5.3.1/5.3/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
diff --git a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
index 2e15247fc1..b515d34047 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles>
-<!-- Written by QtCreator 2.8.82, 2013-10-24T18:43:10. -->
+<!-- Written by QtCreator 3.1.83, 2014-07-22T13:13:46. -->
<qtcreator>
<data>
<variable>Profile.0</variable>
@@ -111,6 +111,7 @@
<variable>Profile.5</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
+ <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value>
@@ -119,13 +120,14 @@
<value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
- <value type="int" key="QtSupport.QtInformation">7</value>
+ <value type="int" key="QtSupport.QtInformation">9</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
- <value type="QString" key="PE.Profile.Id">{9c58fcfd-9e49-4a08-971f-a677dc9ce185}</value>
+ <value type="QString" key="PE.Profile.Id">{17ae70be-817d-4019-9337-fa7761c4b0ed}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
- <value type="QString" key="PE.Profile.Name">Desktop 501 default</value>
+ <value type="QString" key="PE.Profile.Name">Desktop 521 default</value>
<value type="bool" key="PE.Profile.SDK">false</value>
+ <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap>
</data>
<data>
@@ -162,13 +164,14 @@
<value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
- <value type="int" key="QtSupport.QtInformation">9</value>
+ <value type="int" key="QtSupport.QtInformation">11</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
- <value type="QString" key="PE.Profile.Id">{17ae70be-817d-4019-9337-fa7761c4b0ed}</value>
+ <value type="QString" key="PE.Profile.Id">{e91398ba-6443-4b02-b416-782a70d9df90}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
- <value type="QString" key="PE.Profile.Name">Desktop 521 default</value>
+ <value type="QString" key="PE.Profile.Name">Desktop 531 default</value>
<value type="bool" key="PE.Profile.SDK">false</value>
+ <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap>
</data>
<data>
diff --git a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
index 9dd3b5f076..6ed59e9a93 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorQtVersions>
-<!-- Written by Qt Creator 2.5.81, 2012-06-27T15:58:50. -->
+<!-- Written by QtCreator 3.1.83, 2014-07-22T13:13:46. -->
<qtcreator>
<data>
<variable>QtVersion.0</variable>
@@ -55,9 +55,9 @@
<data>
<variable>QtVersion.5</variable>
<valuemap type="QVariantMap">
- <value type="int" key="Id">7</value>
- <value type="QString" key="Name">Desktop Qt 5.0.1 (SQUISH_DEFAULT_COMPILER)</value>
- <value type="QString" key="QMakePath">~/Qt5.0.1/5.0.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
+ <value type="int" key="Id">9</value>
+ <value type="QString" key="Name">Desktop Qt 5.2.1 (SQUISH_DEFAULT_COMPILER)</value>
+ <value type="QString" key="QMakePath">~/Qt5.2.1/5.2.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
@@ -65,9 +65,9 @@
<data>
<variable>QtVersion.6</variable>
<valuemap type="QVariantMap">
- <value type="int" key="Id">9</value>
- <value type="QString" key="Name">Desktop Qt 5.2.1 (SQUISH_DEFAULT_COMPILER)</value>
- <value type="QString" key="QMakePath">~/Qt5.2.1/5.2.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
+ <value type="int" key="Id">11</value>
+ <value type="QString" key="Name">Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value>
+ <value type="QString" key="QMakePath">~/Qt5.3.1/5.3/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
index 658e518ffd..f04407b93b 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles>
-<!-- Written by QtCreator 2.8.82, 2013-10-24T15:19:45. -->
+<!-- Written by QtCreator 3.1.83, 2014-07-21T18:40:39. -->
<qtcreator>
<data>
<variable>Profile.0</variable>
@@ -111,6 +111,7 @@
<variable>Profile.5</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
+ <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
@@ -119,13 +120,14 @@
<value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
- <value type="int" key="QtSupport.QtInformation">18</value>
+ <value type="int" key="QtSupport.QtInformation">20</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
- <value type="QString" key="PE.Profile.Id">{175f6238-a585-4e62-b2d3-d15e90296bb6}</value>
+ <value type="QString" key="PE.Profile.Id">{6a95566e-8372-4372-8286-ef73af7de191}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
- <value type="QString" key="PE.Profile.Name">Desktop 501 default</value>
+ <value type="QString" key="PE.Profile.Name">Desktop 531 default</value>
<value type="bool" key="PE.Profile.SDK">false</value>
+ <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap>
</data>
<data>
diff --git a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
index 543ca215c0..853d07393c 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorQtVersions>
-<!-- Written by QtCreator 2.8.1, 2013-07-15T17:43:58. -->
+<!-- Written by QtCreator 3.1.83, 2014-07-21T18:40:39. -->
<qtcreator>
<data>
<variable>QtVersion.0</variable>
@@ -65,9 +65,9 @@
<data>
<variable>QtVersion.6</variable>
<valuemap type="QVariantMap">
- <value type="int" key="Id">18</value>
- <value type="QString" key="Name">Desktop Qt 5.0.1 (msvc2010)</value>
- <value type="QString" key="QMakePath">C:/Qt/Qt5.0.1/5.0.1/msvc2010/bin/qmake.exe</value>
+ <value type="int" key="Id">4</value>
+ <value type="QString" key="Name">Desktop Qt 5.2.1 (msvc2010)</value>
+ <value type="QString" key="QMakePath">C:/Qt/Qt5.2.1/5.2.1/msvc2010/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
@@ -75,9 +75,9 @@
<data>
<variable>QtVersion.7</variable>
<valuemap type="QVariantMap">
- <value type="int" key="Id">4</value>
- <value type="QString" key="Name">Desktop Qt 5.2.1 (msvc2010)</value>
- <value type="QString" key="QMakePath">C:/Qt/Qt5.2.1/5.2.1/msvc2010/bin/qmake.exe</value>
+ <value type="int" key="Id">20</value>
+ <value type="QString" key="Name">Qt 5.3.1 (msvc2010_opengl)</value>
+ <value type="QString" key="QMakePath">C:/Qt/Qt5.3.1/5.3/msvc2010_opengl/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index 35061df5c0..87ffc83903 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -40,13 +40,13 @@ class Targets:
HARMATTAN = 16
EMBEDDED_LINUX = 32
DESKTOP_480_MSVC2010 = 64
- DESKTOP_501_DEFAULT = 128
- DESKTOP_521_DEFAULT = 256
+ DESKTOP_521_DEFAULT = 128
+ DESKTOP_531_DEFAULT = 256
@staticmethod
def desktopTargetClasses():
desktopTargets = (Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_GCC
- | Targets.DESKTOP_501_DEFAULT | Targets.DESKTOP_521_DEFAULT)
+ | Targets.DESKTOP_521_DEFAULT | Targets.DESKTOP_531_DEFAULT)
if platform.system() in ('Windows', 'Microsoft'):
desktopTargets |= Targets.DESKTOP_480_MSVC2010
return desktopTargets
@@ -67,10 +67,10 @@ class Targets:
return "Embedded Linux"
elif target == Targets.DESKTOP_480_MSVC2010:
return "Desktop 480 MSVC2010"
- elif target == Targets.DESKTOP_501_DEFAULT:
- return "Desktop 501 default"
elif target == Targets.DESKTOP_521_DEFAULT:
return "Desktop 521 default"
+ elif target == Targets.DESKTOP_531_DEFAULT:
+ return "Desktop 531 default"
else:
return None
@@ -88,13 +88,17 @@ class Targets:
def intToArray(targets):
available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.SIMULATOR, Targets.MAEMO5,
Targets.HARMATTAN, Targets.EMBEDDED_LINUX, Targets.DESKTOP_480_MSVC2010,
- Targets.DESKTOP_501_DEFAULT, Targets.DESKTOP_521_DEFAULT]
+ Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT]
return filter(lambda x: x & targets == x, available)
@staticmethod
def arrayToInt(targetArr):
return reduce(operator.or_, targetArr, 0)
+ @staticmethod
+ def getDefaultKit():
+ return Targets.DESKTOP_521_DEFAULT
+
# this class holds some constants for easier usage inside the Projects view
class ProjectSettings:
BUILD = 1
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 3e62cccb85..f94dfa445c 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -385,8 +385,8 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None):
available = availableTargets
else:
# following targets depend on the build environment - added for further/later tests
- available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_501_DEFAULT,
- Targets.DESKTOP_521_DEFAULT, Targets.MAEMO5, Targets.EMBEDDED_LINUX,
+ available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_521_DEFAULT,
+ Targets.DESKTOP_531_DEFAULT, Targets.MAEMO5, Targets.EMBEDDED_LINUX,
Targets.SIMULATOR, Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'):
available.remove(Targets.EMBEDDED_LINUX)
@@ -620,7 +620,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
result.append(Targets.EMBEDDED_LINUX)
elif platform.system() in ('Windows', 'Microsoft'):
result.append(Targets.DESKTOP_480_MSVC2010)
- result.extend([Targets.DESKTOP_501_DEFAULT, Targets.DESKTOP_521_DEFAULT])
+ result.extend([Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT])
if 'MeeGo/Harmattan' in supports:
result.append(Targets.HARMATTAN)
if 'Maemo/Fremantle' in supports:
@@ -629,8 +629,8 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
result.append(Targets.SIMULATOR)
elif 'Platform independent' in text:
# MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not
- result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_501_DEFAULT,
- Targets.DESKTOP_521_DEFAULT, Targets.MAEMO5, Targets.SIMULATOR, Targets.HARMATTAN]
+ result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_521_DEFAULT,
+ Targets.DESKTOP_531_DEFAULT, Targets.MAEMO5, Targets.SIMULATOR, Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'):
result.append(Targets.DESKTOP_480_MSVC2010)
else:
diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py
index e0b9016fef..f795ede512 100755
--- a/tests/system/suite_CCOM/tst_CCOM01/test.py
+++ b/tests/system/suite_CCOM/tst_CCOM01/test.py
@@ -44,7 +44,7 @@ def main():
return
# open example project
# qmlapplicationviewer of this example supports only Qt version < 5
- targets = Targets.desktopTargetClasses() ^ Targets.DESKTOP_501_DEFAULT ^ Targets.DESKTOP_521_DEFAULT
+ targets = Targets.desktopTargetClasses() ^ Targets.DESKTOP_521_DEFAULT ^ Targets.DESKTOP_531_DEFAULT
checkedTargets = openQmakeProject(examplePath, targets)
if not replaceLine("propertyanimation.Sources.main\\.cpp",
"#include <QtGui/QApplication>",
diff --git a/tests/system/suite_CCOM/tst_CCOM02/test.py b/tests/system/suite_CCOM/tst_CCOM02/test.py
index 6244c58ef6..fa2023bcd0 100755
--- a/tests/system/suite_CCOM/tst_CCOM02/test.py
+++ b/tests/system/suite_CCOM/tst_CCOM02/test.py
@@ -44,7 +44,7 @@ def main():
if not startedWithoutPluginError():
return
# open example project
- targets = Targets.desktopTargetClasses() ^ Targets.DESKTOP_501_DEFAULT ^ Targets.DESKTOP_521_DEFAULT
+ targets = Targets.desktopTargetClasses() ^ Targets.DESKTOP_521_DEFAULT ^ Targets.DESKTOP_531_DEFAULT
openQmakeProject(examplePath, targets)
# create syntax error
openDocument("propertyanimation.QML.qml.property-animation\\.qml")
diff --git a/tests/system/suite_debugger/tst_qml_locals/test.py b/tests/system/suite_debugger/tst_qml_locals/test.py
index ce74e4c8a7..b8d1c88bca 100644
--- a/tests/system/suite_debugger/tst_qml_locals/test.py
+++ b/tests/system/suite_debugger/tst_qml_locals/test.py
@@ -54,7 +54,7 @@ def main():
exe, target = getExecutableAndTargetFromToolTip(str(waitForObject(fancyConfButton).toolTip))
if not (test.verify(fancyRunButton.enabled and fancyDebugButton.enabled,
"Verifying Run and Debug are enabled (Qt5 is available).")
- and test.compare(target, Targets.getStringForTarget(Targets.DESKTOP_521_DEFAULT),
+ and test.compare(target, Targets.getStringForTarget(Targets.getDefaultKit()),
"Verifying selected Target is Qt5.")
and test.compare(exe, "QML Scene", "Verifying selected executable is QML Scene.")):
earlyExit("Something went wrong opening Qml project - probably missing Qt5.")
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py
index 36b328d449..641b27da54 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py
@@ -33,8 +33,8 @@ def main():
startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError():
return
- for targ, quickVer in [[Targets.DESKTOP_480_GCC, 1], [Targets.DESKTOP_501_DEFAULT, 2],
- [Targets.DESKTOP_521_DEFAULT, 2]]:
+ for targ, quickVer in [[Targets.DESKTOP_480_GCC, 1], [Targets.DESKTOP_521_DEFAULT, 2],
+ [Targets.DESKTOP_531_DEFAULT, 2]]:
# using a temporary directory won't mess up a potentially existing
createNewQmlExtension(tempDir(), targ, quickVer)
# wait for parsing to complete
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 12:05:19 +0000