Squish: Updated used MSVC Qt versions

Change-Id: Id44c5715c48feeeec0c10a029556c25658e70e72
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

tests/system/settings/windows/QtProject/qtcreator/profiles.xml

@@ -98,13 +98,13 @@
     <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
-    <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{b86e54dd-debd-409c-b4d7-1a5c710eaa37}</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">7</value>
+    <value type="int" key="QtSupport.QtInformation">2</value>
    </valuemap>
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{9b35bbe6-25a7-4cce-ba07-487c795f5265}</value>
-   <value type="QString" key="PE.Profile.Name">Desktop 474 MSVC2008</value>
+   <value type="QString" key="PE.Profile.Name">Desktop 480 MSVC2010</value>
    <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>

tests/system/shared/classes.py

@@ -36,14 +36,14 @@ class Targets:
     MAEMO5 = 4
     HARMATTAN = 8
     EMBEDDED_LINUX = 16
-    DESKTOP_474_MSVC2008 = 32
+    DESKTOP_480_MSVC2010 = 32
     DESKTOP_501_DEFAULT = 64
 
     @staticmethod
     def desktopTargetClasses():
         desktopTargets = Targets.DESKTOP_474_GCC | Targets.DESKTOP_501_DEFAULT
         if platform.system() in ('Windows', 'Microsoft'):
-            desktopTargets |= Targets.DESKTOP_474_MSVC2008
+            desktopTargets |= Targets.DESKTOP_480_MSVC2010
         return desktopTargets
 
     @staticmethod
@@ -58,8 +58,8 @@ class Targets:
             return "Harmattan"
         elif target == Targets.EMBEDDED_LINUX:
             return "Embedded Linux"
-        elif target == Targets.DESKTOP_474_MSVC2008:
+        elif target == Targets.DESKTOP_480_MSVC2010:
-            return "Desktop 474 MSVC2008"
+            return "Desktop 480 MSVC2010"
         elif target == Targets.DESKTOP_501_DEFAULT:
             return "Desktop 501 default"
         else:
@@ -78,7 +78,7 @@ class Targets:
     @staticmethod
     def intToArray(targets):
         available = [Targets.DESKTOP_474_GCC, Targets.SIMULATOR, Targets.MAEMO5, Targets.HARMATTAN,
-                     Targets.EMBEDDED_LINUX, Targets.DESKTOP_474_MSVC2008,
+                     Targets.EMBEDDED_LINUX, Targets.DESKTOP_480_MSVC2010,
                      Targets.DESKTOP_501_DEFAULT]
         return filter(lambda x: x & targets == x, available)
 

tests/system/shared/project.py

@@ -77,8 +77,7 @@ def openCmakeProject(projectPath, buildDir):
     generatorText = "Unix Generator (Desktop 474 GCC)"
     if "win32-" in mkspec:
         generatorName = {"win32-g++" : "MinGW Generator (Desktop 474 GCC)",
-                         "win32-msvc2008" : "NMake Generator (Desktop 474 MSVC2008)",
+                         "win32-msvc2010" : "NMake Generator (Desktop 480 MSVC2010)"}
-                         "win32-msvc2010" : "NMake Generator (Desktop 474 MSVC2010)"}
         if mkspec in generatorName:
             generatorText = generatorName[mkspec]
     index = generatorCombo.findText(generatorText)
@@ -295,7 +294,7 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None,
                      Targets.EMBEDDED_LINUX, Targets.SIMULATOR, Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
             available.remove(Targets.EMBEDDED_LINUX)
-            available.append(Targets.DESKTOP_474_MSVC2008)
+            available.append(Targets.DESKTOP_480_MSVC2010)
     if isMaddeDisabled:
         for target in filter(lambda x: x in available,
                              (Targets.MAEMO5, Targets.HARMATTAN)):
@@ -486,7 +485,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
             if platform.system() in ("Linux", "Darwin"):
                 result.append(Targets.EMBEDDED_LINUX)
             elif platform.system() in ('Windows', 'Microsoft'):
-                result.append(Targets.DESKTOP_474_MSVC2008)
+                result.append(Targets.DESKTOP_480_MSVC2010)
         if 'MeeGo/Harmattan' in supports:
             result.append(Targets.HARMATTAN)
         if 'Maemo/Fremantle' in supports:
@@ -498,7 +497,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
         result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_501_DEFAULT, Targets.MAEMO5,
                   Targets.SIMULATOR, Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
-            result.append(Targets.DESKTOP_474_MSVC2008)
+            result.append(Targets.DESKTOP_480_MSVC2010)
     else:
         test.warning("Returning None (__getSupportedPlatforms__())",
                      "Parsed text: '%s'" % text)

tests/system/suite_general/tst_build_speedcrunch/test.py

@@ -48,7 +48,7 @@ def main():
         return
     suitableKits = Targets.DESKTOP_474_GCC
     if platform.system() in ('Windows', 'Microsoft'):
-        suitableKits |= Targets.DESKTOP_474_MSVC2008
+        suitableKits |= Targets.DESKTOP_480_MSVC2010
     checkedTargets = openQmakeProject(SpeedCrunchPath, suitableKits)
     progressBarWait(30000)