From a42b63ac05bddd5fe12a9fadea883fa12bdcc849 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 16 Mar 2022 13:08:19 +0100 Subject: [PATCH] Squish: Build speedcrunch with Qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1fe79d6775b157fda26248917c9489edca88fd53 Reviewed-by: Robert Löhning --- tests/system/shared/project.py | 6 ++---- tests/system/suite_general/tst_build_speedcrunch/test.py | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index e0b79316b81..16570424b03 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -69,10 +69,8 @@ def openCmakeProject(projectPath, buildDir): invokeMenuItem("File", "Open File or Project...") selectFromFileDialog(projectPath) __chooseTargets__([]) # uncheck all - targetToChoose = Targets.DESKTOP_4_8_7_DEFAULT # FIXME make the intended target a parameter - if not qt4Available: - targetToChoose = Targets.DESKTOP_5_14_1_DEFAULT - __chooseTargets__([targetToChoose], additionalFunc=additionalFunction) + # FIXME make the intended target a parameter + __chooseTargets__([Targets.DESKTOP_5_14_1_DEFAULT], additionalFunc=additionalFunction) clickButton(waitForObject(":Qt Creator.Configure Project_QPushButton")) return True diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py index e98a9b0e9a5..3ebed1b67e8 100644 --- a/tests/system/suite_general/tst_build_speedcrunch/test.py +++ b/tests/system/suite_general/tst_build_speedcrunch/test.py @@ -41,10 +41,7 @@ def main(): startQC() if not startedWithoutPluginError(): return - targetToChoose = Targets.DESKTOP_4_8_7_DEFAULT - if not qt4Available: - targetToChoose = Targets.DESKTOP_5_14_1_DEFAULT - openQmakeProject(SpeedCrunchPath, [targetToChoose]) + openQmakeProject(SpeedCrunchPath, [Targets.DESKTOP_5_14_1_DEFAULT]) waitForProjectParsing() fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton")