summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Löhning <robert.loehning@qt.io>2022-03-18 14:03:20 +0100
committerRobert Löhning <robert.loehning@qt.io>2022-03-18 18:27:32 +0000
commita2735ec024a82b0d19a2c3f55f83701f95db40ff (patch)
tree62b17ed8c3efa1b3218a73ae9b0ef81e61139bf8
parent4e47ed66c98709594d6a38a50793ad2aa0cdd00a (diff)
downloadqt-creator-a2735ec024a82b0d19a2c3f55f83701f95db40ff.tar.gz
Squish: Don't configure projects on Qt4 anymore
Change-Id: Ib09fc44323e09fa4d6a5d2428c35b5b6afe08f24 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--tests/system/suite_CSUP/tst_CSUP03/test.py8
-rw-r--r--tests/system/suite_general/tst_openqt_creator/test.py7
2 files changed, 5 insertions, 10 deletions
diff --git a/tests/system/suite_CSUP/tst_CSUP03/test.py b/tests/system/suite_CSUP/tst_CSUP03/test.py
index a20ac19ea4..67edd64cd1 100644
--- a/tests/system/suite_CSUP/tst_CSUP03/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP03/test.py
@@ -1,6 +1,6 @@
############################################################################
#
-# Copyright (C) 2016 The Qt Company Ltd.
+# Copyright (C) 2022 The Qt Company Ltd.
# Contact: https://www.qt.io/licensing/
#
# This file is part of Qt Creator.
@@ -78,10 +78,8 @@ def main():
continue
if not startCreatorVerifyingClang(useClang):
continue
- targetToChoose = Targets.DESKTOP_4_8_7_DEFAULT
- if not qt4Available:
- targetToChoose = Targets.DESKTOP_5_14_1_DEFAULT
- projectName = createNewNonQtProject(tempDir(), "project-csup03", [targetToChoose])
+ projectName = createNewNonQtProject(tempDir(), "project-csup03",
+ [Targets.DESKTOP_5_14_1_DEFAULT])
checkCodeModelSettings(useClang)
openDocument("%s.Sources.main\\.cpp" % projectName)
editor = getEditorForFileSuffix("main.cpp")
diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py
index 6ff0bfb345..a75be98f7f 100644
--- a/tests/system/suite_general/tst_openqt_creator/test.py
+++ b/tests/system/suite_general/tst_openqt_creator/test.py
@@ -1,6 +1,6 @@
############################################################################
#
-# Copyright (C) 2016 The Qt Company Ltd.
+# Copyright (C) 2022 The Qt Company Ltd.
# Contact: https://www.qt.io/licensing/
#
# This file is part of Qt Creator.
@@ -36,10 +36,7 @@ def main():
return
runButton = findObject(':*Qt Creator.Run_Core::Internal::FancyToolButton')
- targetToChoose = Targets.DESKTOP_4_8_7_DEFAULT
- if not qt4Available:
- targetToChoose = Targets.DESKTOP_5_14_1_DEFAULT
- openQmakeProject(pathSpeedcrunch, [targetToChoose])
+ openQmakeProject(pathSpeedcrunch, [Targets.DESKTOP_5_14_1_DEFAULT])
# Wait for parsing to complete
waitFor("runButton.enabled", 30000)
# Starting before opening, because this is where Creator froze (QTCREATORBUG-10733)