Squish: Adapt to changed ui

Change-Id: Ibad3b2080040f7345125c549527f22f2c246fbef
Reviewed-by: Robert Loehning <robert.loehning@qt.io>

tests/system/shared/project.py

@@ -617,7 +617,7 @@ def addCPlusPlusFile(name, template, projectName, forceOverwrite=False, addToVCS
     if name == None:
         test.fatal("File must have a name - got None.")
         return
-    __createProjectOrFileSelectType__("  C++", template, isProject=False)
+    __createProjectOrFileSelectType__("  C/C++", template, isProject=False)
     window = "{type='ProjectExplorer::JsonWizard' unnamed='1' visible='1'}"
     basePathEdit = waitForObject("{type='Utils::FancyLineEdit' unnamed='1' visible='1' "
                                  "window=%s}" % window)

tests/system/suite_editors/tst_rename_macros/test.py

@@ -42,7 +42,7 @@ def main():
     if not testRenameMacroAfterSourceModification():
         return
     headerName = "anothertestfile.h"
-    addCPlusPlusFile(headerName, "C++ Header File", "testfiles.pro",
+    addCPlusPlusFile(headerName, "C/C++ Header File", "testfiles.pro",
                      expectedHeaderName=headerName)
     if not testRenameMacroAfterSourceMoving():
         return

tests/system/suite_tools/tst_git_local/test.py

@@ -176,7 +176,7 @@ def main():
     commitMessages = [commit("Initial Commit", "Committed 6 files.")]
     clickButton(waitForObject(":*Qt Creator.Clear_QToolButton"))
     headerName = "pointless_header.h"
-    addCPlusPlusFile(headerName, "C++ Header File", projectName + ".pro",
+    addCPlusPlusFile(headerName, "C/C++ Header File", projectName + ".pro",
                      addToVCS="Git", expectedHeaderName=headerName)
     commitMessages.insert(0, commit("Added pointless header file", "Committed 2 files."))
     readmeName = "README.txt"