forked from qt-creator/qt-creator
Squish: Raise minimum Qt version for Qt Quick apps
5.12 is the lowest available version in the wizards now. Change-Id: Ib8de3470188316b01ff521d6e66162baaa8db0af Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -278,7 +278,7 @@ def createProject_Qt_Console(path, projectName, checks = True, buildSystem = Non
|
||||
__verifyFileCreation__(path, expectedFiles)
|
||||
|
||||
def createNewQtQuickApplication(workingDir, projectName=None,
|
||||
targets=Targets.desktopTargetClasses(), minimumQtVersion="5.10",
|
||||
targets=Targets.desktopTargetClasses(), minimumQtVersion="5.12",
|
||||
template="Qt Quick Application - Empty", fromWelcome=False,
|
||||
buildSystem=None):
|
||||
available = __createProjectOrFileSelectType__(" Application (Qt Quick)", template, fromWelcome)
|
||||
@@ -298,7 +298,7 @@ def createNewQtQuickApplication(workingDir, projectName=None,
|
||||
|
||||
return checkedTargets, projectName
|
||||
|
||||
def createNewQtQuickUI(workingDir, qtVersion = "5.10"):
|
||||
def createNewQtQuickUI(workingDir, qtVersion = "5.12"):
|
||||
available = __createProjectOrFileSelectType__(" Other Project", 'Qt Quick UI Prototype')
|
||||
if workingDir == None:
|
||||
workingDir = tempDir()
|
||||
@@ -505,7 +505,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
|
||||
else:
|
||||
version = None
|
||||
if templateName.startswith("Qt Quick Application - "):
|
||||
result = set([Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT])
|
||||
result = set([Targets.DESKTOP_5_14_1_DEFAULT])
|
||||
elif 'Supported Platforms' in text:
|
||||
supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split("\n")
|
||||
result = set()
|
||||
|
||||
@@ -71,7 +71,7 @@ def main():
|
||||
with TestSection("Testing project template %s -> %s" % (category, template)):
|
||||
displayedPlatforms = __createProject__(category, template)
|
||||
if template.startswith("Qt Quick Application - "):
|
||||
qtVersionsForQuick = ["5.10", "5.14"]
|
||||
qtVersionsForQuick = ["5.14"]
|
||||
for counter, qtVersion in enumerate(qtVersionsForQuick):
|
||||
def additionalFunc(displayedPlatforms, qtVersion):
|
||||
requiredQtVersion = __createProjectHandleQtQuickSelection__(qtVersion)
|
||||
|
||||
@@ -30,7 +30,7 @@ def main():
|
||||
if not startedWithoutPluginError():
|
||||
return
|
||||
|
||||
available = [("5.10", "Qt Quick Application - Empty", Targets.DESKTOP_5_10_1_DEFAULT),
|
||||
available = [("5.14", "Qt Quick Application - Empty", Targets.DESKTOP_5_14_1_DEFAULT),
|
||||
("5.14", "Qt Quick Application - Swipe", Targets.DESKTOP_5_14_1_DEFAULT)]
|
||||
|
||||
for qtVersion, appTemplate, targ in available:
|
||||
|
||||
@@ -36,7 +36,7 @@ def main():
|
||||
startQC()
|
||||
if not startedWithoutPluginError():
|
||||
return
|
||||
available = ["5.10", "5.14"]
|
||||
available = ["5.14"]
|
||||
|
||||
for qtVersion in available:
|
||||
# using a temporary directory won't mess up a potentially existing
|
||||
|
||||
Reference in New Issue
Block a user