From 5ce804b53b3351bd7b2c9121df7bdaebeed19cd6 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@nokia.com>
Date: Mon, 26 Mar 2012 14:04:31 +0200
Subject: [PATCH] Squish: Add Qt4.8 to qtversions.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is just a preparation for the next patch.

Change-Id: Icac8584029b4119ebbc70f2cb5766768a61e21a8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
---
 .../system/settings/unix/Nokia/qtversion.xml  | 12 ++++++-
 .../settings/windows/Nokia/qtversion.xml      | 32 ++++++++++++++++++-
 .../tst_build_speedcrunch/test.py             | 11 +++++++
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/tests/system/settings/unix/Nokia/qtversion.xml b/tests/system/settings/unix/Nokia/qtversion.xml
index a06c086f4fb..8d8ce4b3c78 100644
--- a/tests/system/settings/unix/Nokia/qtversion.xml
+++ b/tests/system/settings/unix/Nokia/qtversion.xml
@@ -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>
diff --git a/tests/system/settings/windows/Nokia/qtversion.xml b/tests/system/settings/windows/Nokia/qtversion.xml
index c368196718d..cfc45474e60 100644
--- a/tests/system/settings/windows/Nokia/qtversion.xml
+++ b/tests/system/settings/windows/Nokia/qtversion.xml
@@ -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>
diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py
index a977de109be..cd2c09879a3 100644
--- a/tests/system/suite_general/tst_build_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_build_speedcrunch/test.py
@@ -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: