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

SquishTests: Skip too old Qt on Windows

Browse Source 
When creating a command line project from wizard we end up
with code that is not compilable on Windows when using too
old Qt versions. Explicitly do not use the older Qt versions
as this fails to build and the whole tests would need to get
adapted to handle this appropriate instead.

Change-Id: Ia8a253a0c5d8d20ea181dd33dc8d31cb83cb31c3
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2023-07-25 09:27:25 +02:00
parent 488f1b3d11
commit 4a8c08a349
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,11 +248,16 @@ def createProject_Qt_GUI(path, projectName, checks=True, addToVersionControl="<N
# param path specifies where to create the project
# param projectName is the name for the new project
# param checks turns tests in the function on if set to True
def createProject_Qt_Console(path, projectName, checks = True, buildSystem = None):
def createProject_Qt_Console(path, projectName, checks = True, buildSystem = None, targets=[]):
available = __createProjectOrFileSelectType__(" Application (Qt)", "Qt Console Application")
__createProjectSetNameAndPath__(path, projectName, checks)
buildSystem = __handleBuildSystem__(buildSystem)
__createProjectHandleTranslationSelection__()
if targets:
available = set(targets).intersection(available)
if len(available) < len(targets):
test.warning("Could not use all desired targets.",
"%s vs %s" % (str(available), str(targets)))
__selectQtVersionDesktop__(buildSystem, checks, available)
expectedFiles = []

6
tests/system/suite_debugger/tst_cli_output_console/test.py
View File

@@ -12,7 +12,11 @@ def main():
startQC()
if not startedWithoutPluginError():
return
createProject_Qt_Console(tempDir(), project)
targets = []
if platform.system() in ('Microsoft', 'Windows'):
# Qt5.10 has constructs that do not work on Win because of limitation to older C++
targets = [Targets.DESKTOP_5_14_1_DEFAULT, Targets.DESKTOP_6_2_4]
createProject_Qt_Console(tempDir(), project, targets=targets)
mainEditor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
replaceEditorContent(mainEditor, "")