feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Fix tests after revert

Browse Source 
The patch that removed Qt4 completely from the widget app wizard
has been reverted.
Adjusting the tests now.

Change-Id: I0af1eb2102caa22022658d1189794c7757c7628f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2018-07-26 14:04:17 +02:00
parent 210a873efb
commit 3f97874ca1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/system/shared/project.py
View File

@@ -156,8 +156,12 @@ def __createProjectHandleQtQuickSelection__(minimumQtVersion):
# Selects the Qt versions for a project # Selects the Qt versions for a project
# param checks turns tests in the function on if set to True # param checks turns tests in the function on if set to True
# param available a list holding the available targets # param available a list holding the available targets
def __selectQtVersionDesktop__(checks, available=None): # withoutQt4 if True Qt4 will get unchecked / not selected while checking the targets
checkedTargets = __chooseTargets__(Targets.desktopTargetClasses(), available) def __selectQtVersionDesktop__(checks, available=None, withoutQt4=False):
wanted = Targets.desktopTargetClasses()
if withoutQt4 and Targets.DESKTOP_4_8_7_DEFAULT in wanted:
wanted.remove(Targets.DESKTOP_4_8_7_DEFAULT)
checkedTargets = __chooseTargets__(wanted, available)
if checks: if checks:
for target in checkedTargets: for target in checkedTargets:
detailsWidget = waitForObject("{type='Utils::DetailsWidget' unnamed='1' visible='1' " detailsWidget = waitForObject("{type='Utils::DetailsWidget' unnamed='1' visible='1' "
@@ -216,7 +220,7 @@ def createProject_Qt_GUI(path, projectName, checks = True, addToVersionControl =
template = "Qt Widgets Application" template = "Qt Widgets Application"
available = __createProjectOrFileSelectType__(" Application", template) available = __createProjectOrFileSelectType__(" Application", template)
__createProjectSetNameAndPath__(path, projectName, checks) __createProjectSetNameAndPath__(path, projectName, checks)
checkedTargets = __selectQtVersionDesktop__(checks, available) checkedTargets = __selectQtVersionDesktop__(checks, available, True)
if checks: if checks:
exp_filename = "mainwindow" exp_filename = "mainwindow"
@@ -541,7 +545,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ") supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ")
result = [] result = []
if 'Desktop' in supports: if 'Desktop' in supports:
if (version == None or version < "5.0") and templateName != "Qt Widgets Application": if (version == None or version < "5.0"):
result.append(Targets.DESKTOP_4_8_7_DEFAULT) result.append(Targets.DESKTOP_4_8_7_DEFAULT)
if platform.system() in ("Linux", "Darwin"): if platform.system() in ("Linux", "Darwin"):
result.append(Targets.EMBEDDED_LINUX) result.append(Targets.EMBEDDED_LINUX)