Squish: More explicit name for Desktop kit

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

tests/system/settings/unix/Nokia/qtcreator/profiles.xml

@@ -17,7 +17,7 @@
    </valuemap>
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{4d9ea3ed-a7f0-4b0e-885f-da3b82931988}</value>
-   <value type="QString" key="PE.Profile.Name">Desktop</value>
+   <value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value>
   </valuemap>
  </data>
  <data>

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

@@ -17,7 +17,7 @@
    </valuemap>
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{897290fe-c35a-4e5e-b5e2-d8e448e2aed1}</value>
-   <value type="QString" key="PE.Profile.Name">Desktop</value>
+   <value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value>
   </valuemap>
  </data>
  <data>

tests/system/shared/classes.py

@@ -6,7 +6,7 @@ class QtQuickConstants:
         EXISTING_QML = 4
 
     class Targets:
-        DESKTOP = 1
+        DESKTOP_474_GCC = 1
         SIMULATOR = 2
         MAEMO5 = 4
         HARMATTAN = 8
@@ -25,8 +25,8 @@ class QtQuickConstants:
 
     @staticmethod
     def getStringForTarget(target):
-        if target==QtQuickConstants.Targets.DESKTOP:
-            return "Desktop"
+        if target==QtQuickConstants.Targets.DESKTOP_474_GCC:
+            return "Desktop 474 GCC"
         elif target==QtQuickConstants.Targets.MAEMO5:
             return "Fremantle"
         elif target==QtQuickConstants.Targets.SIMULATOR:
@@ -40,7 +40,7 @@ class QtQuickConstants:
 
     @staticmethod
     def getAllTargets():
-        return [QtQuickConstants.Targets.DESKTOP, QtQuickConstants.Targets.HARMATTAN,
+        return [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.HARMATTAN,
                 QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR,
                 QtQuickConstants.Targets.EMBEDDED_LINUX]
 

tests/system/shared/project.py

@@ -12,7 +12,7 @@ def __handleProcessExited__(object, exitCode):
     global processExited
     processExited = True
 
-def openQmakeProject(projectPath, targets = QtQuickConstants.Targets.DESKTOP, fromWelcome = False):
+def openQmakeProject(projectPath, targets = QtQuickConstants.Targets.DESKTOP_474_GCC, fromWelcome = False):
     cleanUpUserFiles(projectPath)
     if fromWelcome:
         mouseClick(waitForObject(":OpenProject_QStyleItem"), 5, 5, 0, Qt.LeftButton)
@@ -118,7 +118,7 @@ def __createProjectSetNameAndPath__(path, projectName = None, checks = True):
 # param checks turns tests in the function on if set to True
 # param available a list holding the available targets
 def __selectQtVersionDesktop__(checks, available=None):
-    __chooseTargets__(QtQuickConstants.Targets.DESKTOP, available)
+    __chooseTargets__(QtQuickConstants.Targets.DESKTOP_474_GCC, available)
     if checks:
         cbObject = ("{type='QCheckBox' text='%s' unnamed='1' visible='1' "
                     "container={type='Utils::DetailsWidget' visible='1' unnamed='1'}}")
@@ -208,7 +208,7 @@ def createProject_Qt_Console(path, projectName, checks = True):
     __verifyFileCreation__(path, expectedFiles)
 
 def createNewQtQuickApplication(workingDir, projectName = None, templateFile = None,
-                                targets = QtQuickConstants.Targets.DESKTOP, qtQuickVersion=1,
+                                targets = QtQuickConstants.Targets.DESKTOP_474_GCC, qtQuickVersion=1,
                                 fromWelcome=False):
     if templateFile:
         available = __createProjectSelectType__("  Applications", "Qt Quick Application (from Existing QML File)", fromWelcome)
@@ -241,7 +241,7 @@ def createNewQmlExtension(workingDir):
     if workingDir == None:
         workingDir = tempDir()
     __createProjectSetNameAndPath__(workingDir)
-    __chooseTargets__(QtQuickConstants.Targets.DESKTOP, available)
+    __chooseTargets__(QtQuickConstants.Targets.DESKTOP_474_GCC, available)
     nextButton = waitForObject(":Next_QPushButton")
     clickButton(nextButton)
     nameLineEd = waitForObject("{buddy={type='QLabel' text='Object Class-name:' unnamed='1' visible='1'} "
@@ -267,12 +267,12 @@ def __chooseComponents__(components=QtQuickConstants.Components.BUILTIN):
 # parameter target can be an OR'd value of QtQuickConstants.Targets
 # parameter availableTargets should be the result of __createProjectSelectType__()
 #           or use None as a fallback
-def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP, availableTargets=None):
+def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP_474_GCC, availableTargets=None):
     if availableTargets != None:
         available = availableTargets
     else:
         # following targets depend on the build environment - added for further/later tests
-        available = [QtQuickConstants.Targets.DESKTOP,
+        available = [QtQuickConstants.Targets.DESKTOP_474_GCC,
                      QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.EMBEDDED_LINUX,
                      QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
@@ -431,7 +431,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
         result = []
         addSimulator = False
         if 'Desktop' in supports:
-            result.append(QtQuickConstants.Targets.DESKTOP)
+            result.append(QtQuickConstants.Targets.DESKTOP_474_GCC)
             if platform.system() in ("Linux", "Darwin"):
                 result.append(QtQuickConstants.Targets.EMBEDDED_LINUX)
         if 'MeeGo/Harmattan' in supports:
@@ -443,7 +443,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
         if len(result) == 0 or addSimulator:
             result.append(QtQuickConstants.Targets.SIMULATOR)
     elif 'Platform independent' in text:
-        result = [QtQuickConstants.Targets.DESKTOP, QtQuickConstants.Targets.MAEMO5,
+        result = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.MAEMO5,
                   QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
     else:
         test.warning("Returning None (__getSupportedPlatforms__())",

tests/system/suite_debugger/tst_simple_debug/test.py

@@ -5,13 +5,13 @@ workingDir = None
 def main():
     global workingDir
     startApplication("qtcreator" + SettingsPath)
-    if not checkDebuggingLibrary("4.7.4", [QtQuickConstants.Targets.DESKTOP]):
+    if not checkDebuggingLibrary("4.7.4", [QtQuickConstants.Targets.DESKTOP_474_GCC]):
         test.fatal("Error while checking debugging libraries - leaving this test.")
         invokeMenuItem("File", "Exit")
         return
     # using a temporary directory won't mess up a potentially existing
     workingDir = tempDir()
-    projectName = createNewQtQuickApplication(workingDir, targets = QtQuickConstants.Targets.DESKTOP)
+    projectName = createNewQtQuickApplication(workingDir, targets = QtQuickConstants.Targets.DESKTOP_474_GCC)
     # wait for parsing to complete
     waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}",
                   "sourceFilesRefreshed(QStringList)")

tests/system/suite_qtquick/tst_qtquick_creation/test.py

@@ -7,7 +7,7 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     # using a temporary directory won't mess up an eventually exisiting
     workingDir = tempDir()
-    projectName = createNewQtQuickApplication(workingDir, targets = QtQuickConstants.Targets.DESKTOP)
+    projectName = createNewQtQuickApplication(workingDir, targets = QtQuickConstants.Targets.DESKTOP_474_GCC)
     # wait for parsing to complete
     waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
     test.log("Building project")