aboutsummaryrefslogtreecommitdiffstats
path: root/tests/system
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2020-06-11 11:52:51 +0200
committerChristian Stenger <christian.stenger@qt.io>2020-06-11 13:44:24 +0000
commit7c669a06bec1c55e7d184ccb98934fffccae1063 (patch)
tree415bdf3fdbb46dad3c70d8225058fb25db69d121 /tests/system
parent9e73ff6c4e01aaf3e88fa0dcddf13b8ca5258b5f (diff)
Squish: Adapt to changed ui
Change-Id: Ibad3b2080040f7345125c549527f22f2c246fbef Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Diffstat (limited to 'tests/system')
-rw-r--r--tests/system/shared/project.py2
-rw-r--r--tests/system/suite_editors/tst_rename_macros/test.py2
-rw-r--r--tests/system/suite_tools/tst_git_local/test.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 96b79a5c4a..6c0c9c52b4 100644
--- a/tests/system/shared/project.py
+++ b/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)
diff --git a/tests/system/suite_editors/tst_rename_macros/test.py b/tests/system/suite_editors/tst_rename_macros/test.py
index 24c4c22813..2374aafd26 100644
--- a/tests/system/suite_editors/tst_rename_macros/test.py
+++ b/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
diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py
index d5f99f6ea6..f009cf5fa0 100644
--- a/tests/system/suite_tools/tst_git_local/test.py
+++ b/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"