From 1e3b5418eac08df5292913e7ff8841972b72695e Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 7 Sep 2017 18:10:57 +0200 Subject: [PATCH] Squish: Update createNewQtQuickUI() and calling code Change-Id: I117afaabd0baf6074247c55b66d8d302b9dbfd34 Reviewed-by: Christian Stenger --- tests/system/shared/project.py | 2 +- .../tst_qtquick_creation3/test.py | 24 +++++-------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 00135f668ba..8ab86c215e2 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -309,7 +309,7 @@ def createNewQtQuickApplication(workingDir, projectName = None, return checkedTargets, projectName -def createNewQtQuickUI(workingDir, qtVersion = "5.3"): +def createNewQtQuickUI(workingDir, qtVersion = "5.6"): __createProjectOrFileSelectType__(" Other Project", 'Qt Quick UI Prototype') if workingDir == None: workingDir = tempDir() diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index c04b39de8a6..507abffba38 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -30,29 +30,17 @@ def main(): if not startedWithoutPluginError(): return available = ["5.6"] - if platform.system() != 'Darwin': - available.extend(["5.4"]) for qtVersion in available: # using a temporary directory won't mess up a potentially existing workingDir = tempDir() projectName = createNewQtQuickUI(workingDir, qtVersion) - if qtVersion == "5.6": - kit = Targets.getStringForTarget(Targets.DESKTOP_561_DEFAULT) - if addAndActivateKit(Targets.DESKTOP_561_DEFAULT): - quick = "2.6" - else: - test.fatal("Failed to activate kit %s" % kit) - continue - else: # qtVersion == '5.4' - if platform.system() == 'Darwin': - continue - kit = Targets.getStringForTarget(Targets.DESKTOP_541_GCC) - if addAndActivateKit(Targets.DESKTOP_541_GCC): - quick = "2.4" - else: - test.fatal("Failed to activate kit %s" % kit) - continue + kit = Targets.getStringForTarget(Targets.DESKTOP_561_DEFAULT) + if addAndActivateKit(Targets.DESKTOP_561_DEFAULT): + quick = "2.6" + else: + test.fatal("Failed to activate kit %s" % kit) + continue test.log("Running project Qt Quick UI Prototype (%s)" % kit) qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(2, 1, workingDir, projectName, 11223, quick) if qmlViewer!=None: