OSDN Git Service

Squish: Remove non-default Qt versions
authorChristian Stenger <christian.stenger@nokia.com>
Thu, 3 Nov 2011 12:32:02 +0000 (13:32 +0100)
committerChristian Stenger <christian.stenger@nokia.com>
Thu, 3 Nov 2011 13:18:34 +0000 (14:18 +0100)
Change-Id: Ic56fb8f27b92872cac2e24721ecd74253ad25fdd
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
tests/system/settings/windows/Nokia/qtversion.xml

index 8d331de..f4b46e5 100644 (file)
@@ -5,16 +5,6 @@
  <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>
    <value type="QString" key="QMakePath">c:/qtsdk/desktop/qt/4.7.4/msvc2008/bin/qmake.exe</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>
   </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">
    <value type="int" key="Id">8</value>
  </data>
  <data>
   <variable>QtVersion.Count</variable>
-  <value type="int">12</value>
+  <value type="int">10</value>
  </data>
  <data>
   <variable>Version</variable>