Squish: Removing Qt 4.8.0 MinGW kit

Change-Id: Id88c715ee294e337600a5b41abd79569b11eddbf
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

tests/system/settings/windows/QtProject/QtCreator.ini

@@ -1,5 +1,2 @@
 [%General]
 OverrideLanguage=C
-
-[MainWindow]
-WindowGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1H\0\0\0}\0\0\x5\xe0\0\0\x3^\0\0\x1P\0\0\0\x9b\0\0\x5\xd8\0\0\x3V\0\0\0\0\0\0)

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

@@ -142,30 +142,6 @@
  </data>
  <data>
   <variable>Profile.6</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="PE.Profile.AutoDetected">false</value>
-   <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
-   <valuemap type="QVariantMap" key="PE.Profile.Data">
-    <value type="QString" key="Android.GdbServer.Information"></value>
-    <value type="QString" key="Debugger.Information">{2f8a1f59-ddd7-49f0-ae61-1337223f56a3}</value>
-    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
-    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
-    <valuelist type="QVariantList" key="PE.Profile.Environment"/>
-    <value type="QString" key="PE.Profile.SysRoot"></value>
-    <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
-    <value type="QString" key="QtPM4.mkSpecInformation"></value>
-    <value type="int" key="QtSupport.QtInformation">3</value>
-   </valuemap>
-   <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
-   <value type="QString" key="PE.Profile.Id">{9dc9de67-fdc0-4ba6-877a-1463aacd3b3e}</value>
-   <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
-   <value type="QString" key="PE.Profile.Name">Desktop 480 GCC</value>
-   <value type="bool" key="PE.Profile.SDK">false</value>
-   <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
-  </valuemap>
- </data>
- <data>
-  <variable>Profile.7</variable>
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -189,7 +165,7 @@
   </valuemap>
  </data>
  <data>
-  <variable>Profile.8</variable>
+  <variable>Profile.7</variable>
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -214,7 +190,7 @@
  </data>
  <data>
   <variable>Profile.Count</variable>
-  <value type="int">9</value>
+  <value type="int">8</value>
  </data>
  <data>
   <variable>Profile.Default</variable>

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

@@ -14,16 +14,6 @@
  </data>
  <data>
   <variable>QtVersion.1</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.2</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">8</value>
    <value type="QString" key="Name">Qt 4.7.4 for Desktop - MinGW 4.4 (Qt SDK)</value>
@@ -33,7 +23,7 @@
   </valuemap>
  </data>
  <data>
-  <variable>QtVersion.3</variable>
+  <variable>QtVersion.2</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">9</value>
    <value type="QString" key="Name">Simulator Qt for MinGW 4.4 (Qt SDK)</value>
@@ -43,7 +33,7 @@
   </valuemap>
  </data>
  <data>
-  <variable>QtVersion.4</variable>
+  <variable>QtVersion.3</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">15</value>
    <value type="QString" key="Name">Harmattan Target (Qt SDK)</value>
@@ -53,7 +43,7 @@
   </valuemap>
  </data>
  <data>
-  <variable>QtVersion.5</variable>
+  <variable>QtVersion.4</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>
@@ -63,7 +53,7 @@
   </valuemap>
  </data>
  <data>
-  <variable>QtVersion.6</variable>
+  <variable>QtVersion.5</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">4</value>
    <value type="QString" key="Name">Desktop Qt 5.2.1 (msvc2010)</value>
@@ -73,7 +63,7 @@
   </valuemap>
  </data>
  <data>
-  <variable>QtVersion.7</variable>
+  <variable>QtVersion.6</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">20</value>
    <value type="QString" key="Name">Qt 5.3.1 (msvc2010_opengl)</value>
@@ -83,7 +73,7 @@
   </valuemap>
  </data>
  <data>
-  <variable>QtVersion.8</variable>
+  <variable>QtVersion.7</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">22</value>
    <value type="QString" key="Name">Qt %{Qt:Version} (mingw491_32)</value>

tests/system/shared/classes.py

@@ -33,22 +33,19 @@ import operator
 # for easier re-usage (because Python hasn't an enum type)
 class Targets:
     DESKTOP_474_GCC = 1
-    DESKTOP_480_GCC = 2
+    DESKTOP_480_DEFAULT = 2
     SIMULATOR = 4
     MAEMO5 = 8
     HARMATTAN = 16
     EMBEDDED_LINUX = 32
-    DESKTOP_480_MSVC2010 = 64
-    DESKTOP_521_DEFAULT = 128
-    DESKTOP_531_DEFAULT = 256
-    DESKTOP_541_GCC = 512
+    DESKTOP_521_DEFAULT = 64
+    DESKTOP_531_DEFAULT = 128
+    DESKTOP_541_GCC = 256
 
     @staticmethod
     def desktopTargetClasses():
-        desktopTargets = (Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_GCC
+        desktopTargets = (Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_DEFAULT
                           | Targets.DESKTOP_521_DEFAULT | Targets.DESKTOP_531_DEFAULT)
-        if platform.system() in ('Windows', 'Microsoft'):
-            desktopTargets |= Targets.DESKTOP_480_MSVC2010
         if platform.system() != 'Darwin':
             desktopTargets |= Targets.DESKTOP_541_GCC
         return desktopTargets
@@ -57,8 +54,11 @@ class Targets:
     def getStringForTarget(target):
         if target == Targets.DESKTOP_474_GCC:
             return "Desktop 474 GCC"
-        if target == Targets.DESKTOP_480_GCC:
-            return "Desktop 480 GCC"
+        elif target == Targets.DESKTOP_480_DEFAULT:
+            if platform.system() in ('Windows', 'Microsoft'):
+                return "Desktop 480 MSVC2010"
+            else:
+                return "Desktop 480 GCC"
         elif target == Targets.MAEMO5:
             return "Fremantle"
         elif target == Targets.SIMULATOR:
@@ -67,8 +67,6 @@ class Targets:
             return "Harmattan"
         elif target == Targets.EMBEDDED_LINUX:
             return "Embedded Linux"
-        elif target == Targets.DESKTOP_480_MSVC2010:
-            return "Desktop 480 MSVC2010"
         elif target == Targets.DESKTOP_521_DEFAULT:
             return "Desktop 521 default"
         elif target == Targets.DESKTOP_531_DEFAULT:
@@ -90,8 +88,8 @@ class Targets:
 
     @staticmethod
     def intToArray(targets):
-        available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.SIMULATOR, Targets.MAEMO5,
-                     Targets.HARMATTAN, Targets.EMBEDDED_LINUX, Targets.DESKTOP_480_MSVC2010,
+        available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_DEFAULT, Targets.SIMULATOR,
+                     Targets.MAEMO5, Targets.HARMATTAN, Targets.EMBEDDED_LINUX,
                      Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_541_GCC]
         return filter(lambda x: x & targets == x, available)
 

tests/system/shared/project.py

@@ -69,7 +69,7 @@ def __handleCmakeWizardPage__():
     generatorCombo = waitForObject(":Generator:_QComboBox")
     generatorText = "Unix Generator (Desktop 480 GCC)"
     if platform.system() in ('Windows', 'Microsoft'):
-        generatorText = "MinGW Generator (Desktop 480 GCC)"
+        generatorText = "NMake Generator (Desktop 480 MSVC2010)"
     index = generatorCombo.findText(generatorText)
     if index == -1:
         test.warning("No matching CMake generator for found.")
@@ -389,12 +389,11 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None):
         available = availableTargets
     else:
         # following targets depend on the build environment - added for further/later tests
-        available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_521_DEFAULT,
+        available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_DEFAULT, Targets.DESKTOP_521_DEFAULT,
                      Targets.DESKTOP_531_DEFAULT, Targets.MAEMO5, Targets.EMBEDDED_LINUX,
                      Targets.SIMULATOR, Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
             available.remove(Targets.EMBEDDED_LINUX)
-            available.append(Targets.DESKTOP_480_MSVC2010)
         if platform.system() != 'Darwin':
             available.append(Targets.DESKTOP_541_GCC)
     for target in filter(lambda x: x in available,
@@ -621,11 +620,9 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
         if 'Desktop' in supports:
             if version == None or version < "5.0":
                 result.append(Targets.DESKTOP_474_GCC)
-                result.append(Targets.DESKTOP_480_GCC)
+                result.append(Targets.DESKTOP_480_DEFAULT)
                 if platform.system() in ("Linux", "Darwin"):
                     result.append(Targets.EMBEDDED_LINUX)
-                elif platform.system() in ('Windows', 'Microsoft'):
-                    result.append(Targets.DESKTOP_480_MSVC2010)
             result.extend([Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT])
             if platform.system() != 'Darwin':
                 result.append(Targets.DESKTOP_541_GCC)
@@ -637,10 +634,8 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
             result.append(Targets.SIMULATOR)
     elif 'Platform independent' in text:
         # MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not
-        result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_521_DEFAULT,
+        result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_DEFAULT, Targets.DESKTOP_521_DEFAULT,
                   Targets.DESKTOP_531_DEFAULT, Targets.MAEMO5, Targets.SIMULATOR, Targets.HARMATTAN]
-        if platform.system() in ('Windows', 'Microsoft'):
-            result.append(Targets.DESKTOP_480_MSVC2010)
         if platform.system() != 'Darwin':
             result.append(Targets.DESKTOP_541_GCC)
     else:

tests/system/suite_QMLS/tst_QMLS03/test.py

@@ -83,7 +83,7 @@ def main():
     if not startedWithoutPluginError():
         return
     # open example project
-    openQmakeProject(examplePath, Targets.DESKTOP_480_GCC)
+    openQmakeProject(examplePath, Targets.DESKTOP_480_DEFAULT)
     # open qml file
     openDocument("propertyanimation.QML.qml.color-animation\\.qml")
     # get editor

tests/system/suite_editors/tst_qml_editor/test.py

@@ -41,7 +41,7 @@ def main():
     # add docs to have the correct tool tips
     addHelpDocumentation([os.path.join(sdkPath, "Documentation", "qt.qch")])
     templateDir = prepareTemplate(sourceExample)
-    openQmakeProject(os.path.join(templateDir,proFile), Targets.DESKTOP_480_GCC)
+    openQmakeProject(os.path.join(templateDir, proFile), Targets.DESKTOP_480_DEFAULT)
     openDocument("focus.QML.qml.focus\\.qml")
     testRenameId()
     testFindUsages()

tests/system/suite_general/tst_build_speedcrunch/test.py

@@ -47,10 +47,7 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    suitableKits = Targets.DESKTOP_480_GCC
-    if platform.system() in ('Windows', 'Microsoft'):
-        suitableKits |= Targets.DESKTOP_480_MSVC2010
-    checkedTargets = openQmakeProject(SpeedCrunchPath, suitableKits)
+    checkedTargets = openQmakeProject(SpeedCrunchPath, Targets.DESKTOP_480_DEFAULT)
     progressBarWait(30000)
 
     fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton")

tests/system/suite_general/tst_openqt_creator/test.py

@@ -40,7 +40,7 @@ def main():
     if not startedWithoutPluginError():
         return
 
-    openQmakeProject(pathSpeedcrunch, Targets.DESKTOP_480_GCC)
+    openQmakeProject(pathSpeedcrunch, Targets.DESKTOP_480_DEFAULT)
     # Wait for parsing to complete
     progressBarWait(30000)
     openQmakeProject(pathCreator, Targets.DESKTOP_531_DEFAULT)

tests/system/suite_general/tst_session_handling/test.py

@@ -45,7 +45,7 @@ def main():
     if canTestEmbeddedQtQuick():
         checkWelcomePage(sessionName, True)
     for project in projects:
-        openQmakeProject(project, Targets.DESKTOP_480_GCC)
+        openQmakeProject(project, Targets.DESKTOP_480_DEFAULT)
     progressBarWait(20000)
     checkNavigator(68, "Verifying whether all projects have been opened.")
     openDocument("propertyanimation.QML.qml.color-animation\\.qml")

tests/system/suite_qtquick/tst_qml_outline/test.py

@@ -43,7 +43,7 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    openQmakeProject(os.path.join(templateDir, proFile), Targets.DESKTOP_480_GCC)
+    openQmakeProject(os.path.join(templateDir, proFile), Targets.DESKTOP_480_DEFAULT)
     qmlFiles = ["focus.QML.qml.focus\\.qml", "focus.QML.qml.Core.ListMenu\\.qml"]
     checkOutlineFor(qmlFiles)
     testModify()

tests/system/suite_qtquick/tst_qtquick_creation/test.py

@@ -34,7 +34,7 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    for targ, qVer in [[Targets.DESKTOP_480_GCC, "1.1"], [Targets.DESKTOP_521_DEFAULT, "2.1"],
+    for targ, qVer in [[Targets.DESKTOP_480_DEFAULT, "1.1"], [Targets.DESKTOP_521_DEFAULT, "2.1"],
                        [Targets.DESKTOP_521_DEFAULT, "2.2"], [Targets.DESKTOP_531_DEFAULT, "2.3"],
                        [Targets.DESKTOP_521_DEFAULT, "Controls 1.0"], [Targets.DESKTOP_521_DEFAULT, "Controls 1.1"],
                        [Targets.DESKTOP_531_DEFAULT, "Controls 1.2"]]:

tests/system/suite_qtquick/tst_qtquick_creation4/test.py

@@ -34,7 +34,7 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    for targ, quickVer in [[Targets.DESKTOP_480_GCC, 1], [Targets.DESKTOP_521_DEFAULT, 2],
+    for targ, quickVer in [[Targets.DESKTOP_480_DEFAULT, 1], [Targets.DESKTOP_521_DEFAULT, 2],
                            [Targets.DESKTOP_531_DEFAULT, 2]]:
         # using a temporary directory won't mess up a potentially existing
         createNewQmlExtension(tempDir(), targ, quickVer)