From 8cac157529ada874a3ce7530502ab310f856886a Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@nokia.com>
Date: Thu, 3 Nov 2011 13:32:02 +0100
Subject: [PATCH] Squish: Remove non-default Qt versions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic56fb8f27b92872cac2e24721ecd74253ad25fdd
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
---
 .../settings/windows/Nokia/qtversion.xml      | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/tests/system/settings/windows/Nokia/qtversion.xml b/tests/system/settings/windows/Nokia/qtversion.xml
index 8d331de85e2..f4b46e50561 100644
--- a/tests/system/settings/windows/Nokia/qtversion.xml
+++ b/tests/system/settings/windows/Nokia/qtversion.xml
@@ -4,16 +4,6 @@
 <qtcreator>
  <data>
   <variable>QtVersion.0</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">5</value>
-   <value type="QString" key="Name">Qt 4.7.4 (qt)</value>
-   <value type="QString" key="QMakePath">c:/depot/builddir/qt/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.1</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">7</value>
    <value type="QString" key="Name">Qt 4.7.4 for Desktop - MSVC2008 (Qt SDK)</value>
@@ -24,7 +14,7 @@
   </valuemap>
  </data>
  <data>
-  <variable>QtVersion.10</variable>
+  <variable>QtVersion.1</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">16</value>
    <value type="QString" key="Name">Qt for Fremantle PR1.3 Devices (Qt SDK)</value>
@@ -34,16 +24,6 @@
    <value type="bool" key="isAutodetected">true</value>
   </valuemap>
  </data>
- <data>
-  <variable>QtVersion.11</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">17</value>
-   <value type="QString" key="Name">Qt 4.8.0 (qt64)</value>
-   <value type="QString" key="QMakePath">c:/depot/builddir/qt64/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.2</variable>
   <valuemap type="QVariantMap">
@@ -140,7 +120,7 @@
  </data>
  <data>
   <variable>QtVersion.Count</variable>
-  <value type="int">12</value>
+  <value type="int">10</value>
  </data>
  <data>
   <variable>Version</variable>