Merge remote-tracking branch 'origin/3.4'

Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56

tests/system/shared/classes.py

@@ -32,13 +32,11 @@ import operator
 
 # for easier re-usage (because Python hasn't an enum type)
 class Targets:
-    ALL_TARGETS = map(lambda x: 2 ** x , range(9))
+    ALL_TARGETS = map(lambda x: 2 ** x , range(7))
 
     (DESKTOP_474_GCC,
      DESKTOP_480_DEFAULT,
      SIMULATOR,
-     MAEMO5,
-     HARMATTAN,
      EMBEDDED_LINUX,
      DESKTOP_521_DEFAULT,
      DESKTOP_531_DEFAULT,
@@ -46,8 +44,7 @@ class Targets:
 
     @staticmethod
     def desktopTargetClasses():
-        desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.SIMULATOR & ~Targets.MAEMO5
-                          & ~Targets.HARMATTAN & ~Targets.EMBEDDED_LINUX)
+        desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.SIMULATOR & ~Targets.EMBEDDED_LINUX)
         if platform.system() == 'Darwin':
             desktopTargets &= ~Targets.DESKTOP_541_GCC
         return desktopTargets
@@ -61,12 +58,8 @@ class Targets:
                 return "Desktop 480 MSVC2010"
             else:
                 return "Desktop 480 GCC"
-        elif target == Targets.MAEMO5:
-            return "Fremantle"
         elif target == Targets.SIMULATOR:
             return "Qt Simulator"
-        elif target == Targets.HARMATTAN:
-            return "Harmattan"
         elif target == Targets.EMBEDDED_LINUX:
             return "Embedded Linux"
         elif target == Targets.DESKTOP_521_DEFAULT:

tests/system/shared/project.py

@@ -394,9 +394,6 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None):
             available.remove(Targets.EMBEDDED_LINUX)
         elif platform.system() == 'Darwin':
             available.remove(Targets.DESKTOP_541_GCC)
-    for target in filter(lambda x: x in available,
-                         (Targets.MAEMO5, Targets.HARMATTAN)):
-        available.remove(target)
     checkedTargets = []
     for current in available:
         mustCheck = targets & current == current
@@ -624,14 +621,9 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
             result.extend([Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT])
             if platform.system() != 'Darwin':
                 result.append(Targets.DESKTOP_541_GCC)
-        if 'MeeGo/Harmattan' in supports:
-            result.append(Targets.HARMATTAN)
-        if 'Maemo/Fremantle' in supports:
-            result.append(Targets.MAEMO5)
         if not ("BlackBerry" in templateName or re.search("custom Qt Creator plugin", text)) and (version == None or version < "5.0"):
             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 = list(Targets.ALL_TARGETS)
         result.remove(Targets.EMBEDDED_LINUX)
         if platform.system() == 'Darwin':

tests/system/shared/utils.py

@@ -380,20 +380,15 @@ def getConfiguredKits():
     iterateKits(True, True, __setQtVersionForKit__, kitsWithQtVersionName)
     # merge defined target names with their configured Qt versions and devices
     for kit, qtVersion in kitsWithQtVersionName.iteritems():
-        if kit in ('Fremantle', 'Harmattan') and qtVersion == 'None':
-            test.log("Found Kit '%s' with unassigned Qt version (disabled Madde plugin)" % kit)
+        if kit in ('Fremantle', 'Harmattan'):
+            test.verify(qtVersion == 'None',
+                        "The outdated kit '%s' should not have a Qt version" % kit)
         elif qtVersion in qtVersionNames:
             result[kit] = targetsQtVersions[qtVersionNames.index(qtVersion)].items()[0]
         else:
             test.fail("Qt version '%s' for kit '%s' can't be found in qtVersionNames."
                       % (qtVersion, kit))
     clickButton(waitForObject(":Options.Cancel_QPushButton"))
-    # adjust device name(s) to match getStringForTarget() - some differ from time to time
-    for targetName in result.keys():
-        targetInfo = result[targetName]
-        if targetInfo[0] == "Maemo":
-            result.update({targetName:
-                           (Targets.getStringForTarget(Targets.MAEMO5), targetInfo[1])})
     test.log("Configured kits: %s" % str(result))
     return result