From 9d5512b1374998d2928d14e14257253dfa9a0d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Mon, 9 May 2022 21:30:51 +0200 Subject: Squish: Retire Qt4 It can't be built with current compilers anymore and there are no more binary packages publicly available. Change-Id: I906789bbcca053690f39246ff7c3e602703ada37 Reviewed-by: Christian Stenger Reviewed-by: --- tests/system/shared/build_utils.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'tests/system/shared/build_utils.py') diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index a58a1fa93d..b90561fedf 100644 --- a/tests/system/shared/build_utils.py +++ b/tests/system/shared/build_utils.py @@ -190,13 +190,12 @@ def verifyBuildConfig(currentTarget, configName, shouldBeDebug=False, enableShad # it will wait here until compilation of the debug libraries has finished. runCMakeButton = ("{type='QPushButton' text='Run CMake' unnamed='1' " "window=':Qt Creator_Core::Internal::MainWindow'}") - if currentTarget not in (Targets.DESKTOP_4_8_7_DEFAULT, Targets.EMBEDDED_LINUX): - qmlDebuggingCombo = findObject(':Qt Creator.QML debugging and profiling:_QComboBox') - if selectFromCombo(qmlDebuggingCombo, 'Enable'): - if buildSystem is None or buildSystem == "CMake": # re-run cmake to apply - clickButton(waitForObject(runCMakeButton)) - elif buildSystem == "qmake": # Don't rebuild now - clickButton(waitForObject(":QML Debugging.No_QPushButton", 5000)) + qmlDebuggingCombo = findObject(':Qt Creator.QML debugging and profiling:_QComboBox') + if selectFromCombo(qmlDebuggingCombo, 'Enable'): + if buildSystem is None or buildSystem == "CMake": # re-run cmake to apply + clickButton(waitForObject(runCMakeButton)) + elif buildSystem == "qmake": # Don't rebuild now + clickButton(waitForObject(":QML Debugging.No_QPushButton", 5000)) try: problemFound = waitForObject("{window=':Qt Creator_Core::Internal::MainWindow' " "type='QLabel' name='problemLabel' visible='1'}", 1000) @@ -205,14 +204,13 @@ def verifyBuildConfig(currentTarget, configName, shouldBeDebug=False, enableShad except: pass else: - if currentTarget not in (Targets.DESKTOP_4_8_7_DEFAULT, Targets.EMBEDDED_LINUX): - qmlDebuggingCombo = findObject(':Qt Creator.QML debugging and profiling:_QComboBox') - if selectFromCombo(qmlDebuggingCombo, "Disable"): - test.log("Qml debugging libraries are available - unchecked qml debugging.") - if buildSystem is None or buildSystem == "CMake": # re-run cmake to apply - clickButton(waitForObject(runCMakeButton)) - elif buildSystem == "qmake": # Don't rebuild now - clickButton(waitForObject(":QML Debugging.No_QPushButton", 5000)) + qmlDebuggingCombo = findObject(':Qt Creator.QML debugging and profiling:_QComboBox') + if selectFromCombo(qmlDebuggingCombo, "Disable"): + test.log("Qml debugging libraries are available - unchecked qml debugging.") + if buildSystem is None or buildSystem == "CMake": # re-run cmake to apply + clickButton(waitForObject(runCMakeButton)) + elif buildSystem == "qmake": # Don't rebuild now + clickButton(waitForObject(":QML Debugging.No_QPushButton", 5000)) clickButton(waitForObject(":scrollArea.Details_Utils::DetailsButton")) switchViewTo(ViewConstants.EDIT) -- cgit v1.2.1