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

Squish: Add Qt4.8 to qtversions.xml

Browse Source 
This is just a preparation for the next patch.

Change-Id: Icac8584029b4119ebbc70f2cb5766768a61e21a8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
This commit is contained in:
Christian Stenger
2012-03-26 14:04:31 +02:00
parent 83457326d1
commit 5ce804b53b
3 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/system/settings/unix/Nokia/qtversion.xml
View File

@@ -53,9 +53,19 @@
<value type="bool" key="isAutodetected">true</value>
</valuemap>
</data>
<data>
<variable>QtVersion.5</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">2</value>
<value type="QString" key="Name">Desktop Qt 4.8 for GCC (Qt SDK)</value>
<value type="QString" key="QMakePath">~/QtSDK/Desktop/Qt/4.8.0/gcc/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.Count</variable>
<value type="int">5</value>
<value type="int">6</value>
</data>
<data>
<variable>Version</variable>

32
tests/system/settings/windows/Nokia/qtversion.xml
View File

@@ -107,9 +107,39 @@
<value type="bool" key="isAutodetected">true</value>
</valuemap>
</data>
<data>
<variable>QtVersion.9</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">1</value>
<value type="QString" key="Name">Qt 4.8 for Desktop - MSVC2008 (Qt SDK)</value>
<value type="QString" key="QMakePath">C:/QtSDK/Desktop/Qt/4.8.0/msvc2008/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.10</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">2</value>
<value type="QString" key="Name">Qt 4.8 for Desktop - MSVC2010 (Qt SDK)</value>
<value type="QString" key="QMakePath">C:/QtSDK/Desktop/Qt/4.8.0/msvc2010/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.10</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">3</value>
<value type="QString" key="Name">Qt 4.8 for Desktop - MinGW (Qt SDK)</value>
<value type="QString" key="QMakePath">C:/QtSDK/Desktop/Qt/4.8.0/mingw/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.Count</variable>
<value type="int">9</value>
<value type="int">12</value>
</data>
<data>
<variable>Version</variable>

11
tests/system/suite_general/tst_build_speedcrunch/test.py
View File

@@ -1,4 +1,5 @@
source("../../shared/qtcreator.py")
import re
SpeedCrunchPath = ""
@@ -25,7 +26,17 @@ def main():
fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton")
qtVerPattern = re.compile("\d\.\d(\.\d+)?")
for config in iterateBuildConfigs(1, 0, "(Desktop )?Qt.*Release"):
qtVersion = qtVerPattern.search(config)
if qtVersion:
qtVersion = qtVersion.group()
if qtVersion >= "4.8":
test.log("Skipping config %s - this project needs Qt <= 4.7.x (got %s)" % (config, qtVersion))
continue
else:
test.warning("Could not determine Qt version for config '%s' - skipping..." % config)
continue
selectBuildConfig(1, 0, config)
buildConfig = buildConfigFromFancyToolButton(fancyToolButton)
if buildConfig != config: