Squish: Fix remove kits test

cmake is automatically running when re-opening a project
and creates a temporary kit which was different when using qmake.
Switch back to qmake and enhance later to support cmake as well.

Change-Id: Id3e1dc23c828a6e2af5454863e1349d9866dfa38
Reviewed-by: Robert Löhning <robert.loehning@qt.io>

tests/system/shared/classes.py

@@ -46,11 +46,11 @@ class Targets:
                                      "Desktop 5.14.1 default"]))
 
     @staticmethod
-    def availableTargetClasses():
+    def availableTargetClasses(ignoreValidity=False):
         availableTargets = set(Targets.ALL_TARGETS)
-        if not qt4Available:
+        if not qt4Available and not ignoreValidity:
             availableTargets.remove(Targets.DESKTOP_4_8_7_DEFAULT)
-        if not qt4Available or platform.system() in ('Windows', 'Microsoft'):
+        if not (qt4Available or ignoreValidity) or platform.system() in ('Windows', 'Microsoft'):
             availableTargets.remove(Targets.EMBEDDED_LINUX)
         elif platform.system() == 'Darwin':
             availableTargets.remove(Targets.DESKTOP_5_4_1_GCC)

tests/system/suite_general/tst_remove_kits/test.py

@@ -54,9 +54,9 @@ def main():
     startQC()
     if not startedWithoutPluginError():
         return
-    createProject_Qt_Console(tempDir(), "SquishProject")
+    createProject_Qt_Console(tempDir(), "SquishProject", buildSystem = "qmake")
     switchViewTo(ViewConstants.PROJECTS)
-    verifyProjectsMode(Targets.getTargetsAsStrings(Targets.availableTargetClasses()))
+    verifyProjectsMode(Targets.getTargetsAsStrings(Targets.availableTargetClasses(True)))
     iterateKits(True, False, __removeKit__)
     clickButton(waitForObject(":Options.OK_QPushButton"))
     verifyProjectsMode([])