diff options
author | Robert Loehning <robert.loehning@qt.io> | 2020-02-06 21:05:01 +0100 |
---|---|---|
committer | Robert Loehning <robert.loehning@qt.io> | 2020-03-10 15:59:08 +0000 |
commit | aac77eecb97d49b91bf063a6da324107ffc71aaa (patch) | |
tree | 738f96a5e3c4636615a02040f29cf9ff26505620 /tests | |
parent | 4e4b8965a9358143a6e75afe4dc1b4a949491df1 (diff) | |
download | qt-creator-aac77eecb97d49b91bf063a6da324107ffc71aaa.tar.gz |
Squish: Replace Qt version 5.6.1 with 5.14.1
Task-number: QTCREATORBUG-22111
Change-Id: Iaae052e73a264252e399bd0992be4b420e2799ae
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests')
31 files changed, 95 insertions, 76 deletions
diff --git a/tests/system/README b/tests/system/README index 57816f235b..05fe472d5a 100644 --- a/tests/system/README +++ b/tests/system/README @@ -30,24 +30,24 @@ locations. On Linux/macOS this is ~/Qt5.x.1 and on Windows this is C:\Qt\Qt5.x.1 use installations of the official opensource Qt packages. Just install the Qt version for the respective toolchain with the components (if available): - (Desktop) <toolchain> <bitness>, e.g. Desktop gcc 64-bit -- Qt Quick Controls +- Qt Quick Controls (if available) - Qt Script The exact versions and toolchains are: Linux: Qt 5.4.1 (gcc) -Qt 5.6.1-1 (gcc) Qt 5.10.1 (gcc) +Qt 5.14.1 (gcc) macOS: -Qt 5.6.1-1 (clang) Qt 5.10.1 (clang) +Qt 5.14.1 (clang) Windows: Qt 5.4.1 (gcc) -Qt 5.6.1-1 (MSVC2013, 32 bit) Qt 5.10.1 (MSVC2015, 32 bit) +Qt 5.14.1 (MSVC2017, 64 bit) Fourth - you'll have to provide some additional repositories. These additional repositories are located inside ~/squish-data or C:\Users\<user>\squish-data (depending on the OS you're on). diff --git a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml index f64b5ba055..cf36fa263f 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml @@ -49,7 +49,7 @@ <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Id">{fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a}</value> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> - <value type="QString" key="PE.Profile.Name">Desktop 5.6.1 default</value> + <value type="QString" key="PE.Profile.Name">Desktop 5.14.1 default</value> <value type="bool" key="PE.Profile.SDK">false</value> <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/> </valuemap> diff --git a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml index f9a0babe52..6521f404a1 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml @@ -17,7 +17,7 @@ <valuemap type="QVariantMap"> <value type="int" key="Id">9</value> <value type="QString" key="Name">Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER)</value> - <value type="QString" key="QMakePath">~/Qt5.6.1/5.6/SQUISH_DEFAULT_COMPILER/bin/qmake</value> + <value type="QString" key="QMakePath">~/Qt5.14.1/5.14.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="bool" key="isAutodetected">false</value> </valuemap> diff --git a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml index 627451db8b..81f328703d 100644 --- a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml @@ -91,7 +91,7 @@ <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Id">{542217c7-ce0f-48f7-843b-d4fad339688d}</value> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> - <value type="QString" key="PE.Profile.Name">Desktop 5.6.1 default</value> + <value type="QString" key="PE.Profile.Name">Desktop 5.14.1 default</value> <value type="bool" key="PE.Profile.SDK">false</value> <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/> </valuemap> diff --git a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml index 90e86a4f6a..cb20891486 100644 --- a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml @@ -27,7 +27,7 @@ <valuemap type="QVariantMap"> <value type="int" key="Id">15</value> <value type="QString" key="Name">Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER)</value> - <value type="QString" key="QMakePath">~/Qt5.6.1/5.6/SQUISH_DEFAULT_COMPILER/bin/qmake</value> + <value type="QString" key="QMakePath">~/Qt5.14.1/5.14.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="bool" key="isAutodetected">false</value> </valuemap> diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml index ac1911748f..fab3964977 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml @@ -72,8 +72,8 @@ <value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.ToolChain">{7ca0887f-a9a5-4251-aba6-560a15595d20}</value> <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> - <value type="QByteArray" key="C">{d35e7a1a-5ab8-4fd6-8a2c-634846c669bb}</value> - <value type="QString" key="Cxx">{7ca0887f-a9a5-4251-aba6-560a15595d20}</value> + <value type="QByteArray" key="C">{ce3a8004-e9ae-46f2-b62d-d7daf69435ca}</value> + <value type="QByteArray" key="Cxx">{3df7c776-a480-4a04-9099-6c75adac2dca}</value> </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">24</value> @@ -81,7 +81,7 @@ <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Id">{f9c7858c-d167-4b78-847a-91943bd0af07}</value> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> - <value type="QString" key="PE.Profile.Name">Desktop 5.6.1 default</value> + <value type="QString" key="PE.Profile.Name">Desktop 5.14.1 default</value> <value type="bool" key="PE.Profile.SDK">false</value> <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/> </valuemap> diff --git a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml index e9c384e634..2939316b75 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml @@ -26,8 +26,8 @@ <variable>QtVersion.2</variable> <valuemap type="QVariantMap"> <value type="int" key="Id">24</value> - <value type="QString" key="Name">Qt %{Qt:Version} (msvc2013)</value> - <value type="QString" key="QMakePath">C:/Qt/Qt5.6.1/5.6/msvc2013/bin/qmake.exe</value> + <value type="QString" key="Name">Qt %{Qt:Version} (msvc2017_64)</value> + <value type="QString" key="QMakePath">C:/Qt/Qt5.14.1/5.14.1/msvc2017_64/bin/qmake.exe</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="bool" key="isAutodetected">false</value> </valuemap> diff --git a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml index 1dea56573e..49518d2d28 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml @@ -49,6 +49,19 @@ <data> <variable>ToolChain.3</variable> <valuemap type="QVariantMap"> + <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2017-pe-64bit</value> + <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat</value> + <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">amd64</value> + <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> + <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MSVC2017 (amd64)</value> + <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{ce3a8004-e9ae-46f2-b62d-d7daf69435ca}</value> + <value type="int" key="ProjectExplorer.ToolChain.Language">1</value> + <value type="QString" key="ProjectExplorer.ToolChain.LanguageV2">C</value> + </valuemap> + </data> + <data> + <variable>ToolChain.4</variable> + <valuemap type="QVariantMap"> <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2015-pe-32bit</value> <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat</value> <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">x86</value> @@ -60,7 +73,7 @@ </valuemap> </data> <data> - <variable>ToolChain.4</variable> + <variable>ToolChain.5</variable> <valuemap type="QVariantMap"> <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2015-pe-32bit</value> <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat</value> @@ -73,7 +86,7 @@ </valuemap> </data> <data> - <variable>ToolChain.5</variable> + <variable>ToolChain.6</variable> <valuemap type="QVariantMap"> <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2013-pe-32bit</value> <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat</value> @@ -84,8 +97,21 @@ </valuemap> </data> <data> + <variable>ToolChain.7</variable> + <valuemap type="QVariantMap"> + <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2017-pe-64bit</value> + <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat</value> + <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">amd64</value> + <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> + <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MSVC2017 (amd64)</value> + <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{3df7c776-a480-4a04-9099-6c75adac2dca}</value> + <value type="int" key="ProjectExplorer.ToolChain.Language">2</value> + <value type="QString" key="ProjectExplorer.ToolChain.LanguageV2">Cxx</value> + </valuemap> + </data> + <data> <variable>ToolChain.Count</variable> - <value type="int">6</value> + <value type="int">8</value> </data> <data> <variable>Version</variable> diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index 90bbe4d796..3a675c61e5 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -32,15 +32,15 @@ class Targets: (DESKTOP_4_8_7_DEFAULT, EMBEDDED_LINUX, DESKTOP_5_4_1_GCC, - DESKTOP_5_6_1_DEFAULT, - DESKTOP_5_10_1_DEFAULT) = ALL_TARGETS + DESKTOP_5_10_1_DEFAULT, + DESKTOP_5_14_1_DEFAULT) = ALL_TARGETS __TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS, ["Desktop 4.8.7 default", "Embedded Linux", "Desktop 5.4.1 GCC", - "Desktop 5.6.1 default", - "Desktop 5.10.1 default"])) + "Desktop 5.10.1 default", + "Desktop 5.14.1 default"])) @staticmethod def availableTargetClasses(): @@ -71,7 +71,7 @@ class Targets: @staticmethod def getDefaultKit(): - return Targets.DESKTOP_5_6_1_DEFAULT + return Targets.DESKTOP_5_14_1_DEFAULT # this class holds some constants for easier usage inside the Projects view class ProjectSettings: @@ -106,7 +106,7 @@ class Qt5Path: @staticmethod def getPaths(pathSpec): - qt5targets = [Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT] + qt5targets = [Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT] if platform.system() != 'Darwin': qt5targets.append(Targets.DESKTOP_5_4_1_GCC) if pathSpec == Qt5Path.DOCS: diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 39cdda4351..96b79a5c4a 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -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.6", + targets=Targets.desktopTargetClasses(), minimumQtVersion="5.10", 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.6"): +def createNewQtQuickUI(workingDir, qtVersion = "5.10"): available = __createProjectOrFileSelectType__(" Other Project", 'Qt Quick UI Prototype') if workingDir == None: workingDir = tempDir() @@ -316,7 +316,7 @@ def createNewQtQuickUI(workingDir, qtVersion = "5.6"): return checkedTargets, projectName -def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_5_6_1_DEFAULT]): +def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_5_14_1_DEFAULT]): available = __createProjectOrFileSelectType__(" Library", "Qt Quick 2 Extension Plugin") if workingDir == None: workingDir = tempDir() @@ -505,10 +505,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): else: version = None if templateName.startswith("Qt Quick Application - "): - if templateName == "Qt Quick Application - Empty": - result = set([Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT]) - else: - result = set([Targets.DESKTOP_5_10_1_DEFAULT]) + result = set([Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT]) elif 'Supported Platforms' in text: supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ") result = set() @@ -517,7 +514,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): result.add(Targets.DESKTOP_4_8_7_DEFAULT) if platform.system() in ("Linux", "Darwin"): result.add(Targets.EMBEDDED_LINUX) - result = result.union(set([Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT])) + result = result.union(set([Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT])) if platform.system() != 'Darwin': result.add(Targets.DESKTOP_5_4_1_GCC) elif 'Platform independent' in text: diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py index fb04c53fa8..e08901fb6d 100644 --- a/tests/system/suite_APTW/tst_APTW03/test.py +++ b/tests/system/suite_APTW/tst_APTW03/test.py @@ -86,7 +86,7 @@ def main(): checkSimpleCppLib("SampleApp1", False) checkSimpleCppLib("SampleApp2", True) - pluginTargets = (Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT) + pluginTargets = (Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT) projectName, className = createNewQtPlugin(tempDir(), "SampleApp3", "MyPlugin", pluginTargets) virtualFunctionsAdded = False for kit, config in iterateBuildConfigs("Debug"): diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py index 6c9101c381..20dd368a80 100755 --- a/tests/system/suite_CCOM/tst_CCOM01/test.py +++ b/tests/system/suite_CCOM/tst_CCOM01/test.py @@ -28,7 +28,7 @@ source("../../shared/qtcreator.py") # entry of test def main(): # prepare example project - sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "quick", "animation") proFile = "animation.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): @@ -42,6 +42,7 @@ def main(): # open example project, supports only Qt 5 targets = Targets.desktopTargetClasses() targets.discard(Targets.DESKTOP_4_8_7_DEFAULT) + targets.discard(Targets.DESKTOP_5_4_1_GCC) openQmakeProject(examplePath, targets) # build and wait until finished - on all build configurations availableConfigs = iterateBuildConfigs() diff --git a/tests/system/suite_CCOM/tst_CCOM02/test.py b/tests/system/suite_CCOM/tst_CCOM02/test.py index b49594ddfb..f44d68ffd0 100755 --- a/tests/system/suite_CCOM/tst_CCOM02/test.py +++ b/tests/system/suite_CCOM/tst_CCOM02/test.py @@ -29,7 +29,7 @@ source("../../shared/qtcreator.py") # entry of test def main(): # prepare example project - sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "quick", "animation") proFile = "animation.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): diff --git a/tests/system/suite_CSUP/tst_CSUP04/test.py b/tests/system/suite_CSUP/tst_CSUP04/test.py index 143e3fe812..99ec6ae8db 100644 --- a/tests/system/suite_CSUP/tst_CSUP04/test.py +++ b/tests/system/suite_CSUP/tst_CSUP04/test.py @@ -28,7 +28,7 @@ source("../../shared/qtcreator.py") # entry of test def main(): # prepare example project - sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "gui", "openglwindow") proFile = "openglwindow.pro" diff --git a/tests/system/suite_CSUP/tst_CSUP05/test.py b/tests/system/suite_CSUP/tst_CSUP05/test.py index 3e686b0509..2bd3dd846c 100644 --- a/tests/system/suite_CSUP/tst_CSUP05/test.py +++ b/tests/system/suite_CSUP/tst_CSUP05/test.py @@ -28,7 +28,7 @@ source("../../shared/qtcreator.py") # entry of test def main(): # prepare example project - sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "gui", "openglwindow") proFile = "openglwindow.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): diff --git a/tests/system/suite_CSUP/tst_CSUP06/test.py b/tests/system/suite_CSUP/tst_CSUP06/test.py index 3626a95951..c28c8bb198 100644 --- a/tests/system/suite_CSUP/tst_CSUP06/test.py +++ b/tests/system/suite_CSUP/tst_CSUP06/test.py @@ -168,7 +168,7 @@ def main(): with TestSection(getCodeModelString(useClang)): if not startCreatorVerifyingClang(useClang): continue - openQmakeProject(examplePath, [Targets.DESKTOP_5_6_1_DEFAULT]) + openQmakeProject(examplePath, [Targets.DESKTOP_5_14_1_DEFAULT]) checkCodeModelSettings(useClang) if not openDocument("cplusplus-tools.Sources.main\\.cpp"): earlyExit("Failed to open main.cpp.") diff --git a/tests/system/suite_QMLS/tst_QMLS03/test.py b/tests/system/suite_QMLS/tst_QMLS03/test.py index c82568a6bc..a1f742eee3 100644 --- a/tests/system/suite_QMLS/tst_QMLS03/test.py +++ b/tests/system/suite_QMLS/tst_QMLS03/test.py @@ -67,7 +67,7 @@ def checkUsages(resultsView, expectedResults, directory): def main(): # prepare example project - sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "quick", "animation") proFile = "animation.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): @@ -80,7 +80,7 @@ def main(): if not startedWithoutPluginError(): return # open example project - openQmakeProject(examplePath, [Targets.DESKTOP_5_6_1_DEFAULT]) + openQmakeProject(examplePath, [Targets.DESKTOP_5_14_1_DEFAULT]) # open qml file openDocument("animation.Resources.animation\\.qrc./animation.basics.color-animation\\.qml") # get editor @@ -94,10 +94,10 @@ def main(): type(editorArea, "<Left>") invokeContextMenuItem(editorArea, "Find References to Symbol Under Cursor") # check if usage was properly found - expectedResults = [ExpectedResult("color-animation.qml", 49, "Rectangle {"), - ExpectedResult("color-animation.qml", 109, "Rectangle {"), - ExpectedResult("property-animation.qml", 48, "Rectangle {"), - ExpectedResult("property-animation.qml", 57, "Rectangle {")] + expectedResults = [ExpectedResult("color-animation.qml", 59, "Rectangle {"), + ExpectedResult("color-animation.qml", 119, "Rectangle {"), + ExpectedResult("property-animation.qml", 58, "Rectangle {"), + ExpectedResult("property-animation.qml", 67, "Rectangle {")] resultsView = waitForObject(":Qt Creator_Find::Internal::SearchResultTreeView") test.verify(checkUsages(resultsView, expectedResults, templateDir), "Verifying if usages were properly found using context menu.") @@ -113,10 +113,10 @@ def main(): type(editorArea, "<Left>") invokeMenuItem("Tools", "QML/JS", "Find References to Symbol Under Cursor") # check if usage was properly found - expectedResults = [ExpectedResult("color-animation.qml", 50, "anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }"), - ExpectedResult("color-animation.qml", 110, "anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }"), - ExpectedResult("property-animation.qml", 49, "anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }"), - ExpectedResult("property-animation.qml", 58, "anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }")] + expectedResults = [ExpectedResult("color-animation.qml", 60, "anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }"), + ExpectedResult("color-animation.qml", 120, "anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }"), + ExpectedResult("property-animation.qml", 59, "anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }"), + ExpectedResult("property-animation.qml", 68, "anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }")] resultsView = waitForObject(":Qt Creator_Find::Internal::SearchResultTreeView") test.verify(checkUsages(resultsView, expectedResults, templateDir), "Verifying if usages were properly found using main menu.") @@ -132,7 +132,7 @@ def main(): type(editorArea, "<Left>") type(editorArea, "<Ctrl+Shift+u>") # check if usage was properly found - expectedResults = [ExpectedResult("color-animation.qml", 93, "SequentialAnimation on opacity {")] + expectedResults = [ExpectedResult("color-animation.qml", 103, "SequentialAnimation on opacity {")] resultsView = waitForObject(":Qt Creator_Find::Internal::SearchResultTreeView") test.verify(checkUsages(resultsView, expectedResults, templateDir), "Verifying if usages were properly found using shortcut.") diff --git a/tests/system/suite_WELP/tst_WELP02/test.py b/tests/system/suite_WELP/tst_WELP02/test.py index b44f0382dc..d2650081f8 100644 --- a/tests/system/suite_WELP/tst_WELP02/test.py +++ b/tests/system/suite_WELP/tst_WELP02/test.py @@ -65,7 +65,7 @@ def checkTypeAndProperties(typePropertiesDetails): def main(): # prepare example project - sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "quick", "animation") if not neededFilePresent(sourceExample): return diff --git a/tests/system/suite_debugger/tst_qml_js_console/test.py b/tests/system/suite_debugger/tst_qml_js_console/test.py index b94303bfb1..c7d9df09f2 100644 --- a/tests/system/suite_debugger/tst_qml_js_console/test.py +++ b/tests/system/suite_debugger/tst_qml_js_console/test.py @@ -114,6 +114,8 @@ def testLoggingFeatures(): clickButton(":*Qt Creator.Clear_QToolButton") def main(): + test.xfail("Skipping test. This will not work correctly with Qt <= 5.15 (QTBUG-82150).") + return projName = "simpleQuickUI2.qmlproject" projFolder = os.path.dirname(findFile("testdata", "simpleQuickUI2/%s" % projName)) if not neededFilePresent(os.path.join(projFolder, projName)): diff --git a/tests/system/suite_debugger/tst_qml_locals/test.py b/tests/system/suite_debugger/tst_qml_locals/test.py index f85a2d3b23..63516e8951 100644 --- a/tests/system/suite_debugger/tst_qml_locals/test.py +++ b/tests/system/suite_debugger/tst_qml_locals/test.py @@ -27,6 +27,8 @@ source("../../shared/qtcreator.py") source("Tree.py") def main(): + test.xfail("Skipping test. This must be rewritten for current kits.") + return if os.getenv("SYSTEST_OPENGL_MISSING") == "1": test.xfail("This test needs OpenGL - skipping...") return diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py index 6c694f063e..69ee40d5b6 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/test.py +++ b/tests/system/suite_debugger/tst_simple_analyze/test.py @@ -66,8 +66,7 @@ def performTest(workingDir, projectName, availableConfigs): # because of differences between MSVC's and MinGW's Makefile (so clean before changing kit) invokeMenuItem('Build', 'Clean Project "%s"' % projectName) verifyBuildConfig(kit, config, True, True, True) - qtVersion = "5.6.1" if kit == Targets.DESKTOP_5_6_1_DEFAULT else "5.10.1" - test.log("Selected kit using Qt %s" % qtVersion) + test.log("Selected kit '%s'" % Targets.getStringForTarget(kit)) # explicitly build before start debugging for adding the executable as allowed program to WinFW invokeMenuItem("Build", "Rebuild All Projects") waitForCompile() @@ -100,7 +99,7 @@ def performTest(workingDir, projectName, availableConfigs): colMean, colMedian, colLongest, colShortest) = range(2, 11) model = waitForObject(":Events.QmlProfilerEventsTable_QmlProfiler::" "Internal::QmlProfilerStatisticsMainView").model() - compareEventsTab(model, "events_qt%s.tsv" % qtVersion) + compareEventsTab(model, "events_qt5.10.1.tsv") test.compare(dumpItems(model, column=colPercent)[0], '100 %') # cannot run following test on colShortest (unstable) for i in [colMean, colMedian, colLongest]: diff --git a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.6.1.tsv b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.6.1.tsv deleted file mode 100644 index a5228fad41..0000000000 --- a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.6.1.tsv +++ /dev/null @@ -1,9 +0,0 @@ -"0" "1" "6" "11" -"<program>" "" "1" "Main program" -"main.qml:15" "Handling Signal" "2" "onTriggered: { runCount += 1; var i; for (i = 1; i < 2500; ++i) { var j = i * i; console.log(j); } }" -"main.qml:15" "JavaScript" "2" "onTriggered" -"main.qml:4" "Creating" "2" "QtQuick.Window/Window" -"main.qml:1" "Compiling" "1" "main.qml" -"main.qml:10" "Creating" "2" "QtQuick/Timer" -"main.qml:14" "Binding" "3" "running: runCount < 2" -"main.qml:14" "JavaScript" "3" "expression for running" diff --git a/tests/system/suite_editors/tst_memberoperator/test.py b/tests/system/suite_editors/tst_memberoperator/test.py index 99e511049a..f7e7ed6737 100644 --- a/tests/system/suite_editors/tst_memberoperator/test.py +++ b/tests/system/suite_editors/tst_memberoperator/test.py @@ -47,7 +47,8 @@ def main(): if not startCreatorVerifyingClang(useClang): continue createProject_Qt_Console(tempDir(), "SquishProject") - selectBuildConfig(Targets.DESKTOP_5_6_1_DEFAULT, "Debug") # do not use the default Qt4 + # by default Qt4 is selected, use a Qt5 kit instead + selectBuildConfig(Targets.DESKTOP_5_10_1_DEFAULT, "Debug") checkCodeModelSettings(useClang) selectFromLocator("main.cpp") cppwindow = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") diff --git a/tests/system/suite_editors/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py index 56179134cb..ecd9ab008e 100644 --- a/tests/system/suite_editors/tst_qml_editor/test.py +++ b/tests/system/suite_editors/tst_qml_editor/test.py @@ -28,7 +28,7 @@ source("../../shared/qtcreator.py") focusDocumentPath = "keyinteraction.Resources.keyinteraction\.qrc./keyinteraction.focus.%s" def main(): - target = Targets.DESKTOP_5_6_1_DEFAULT + target = Targets.DESKTOP_5_14_1_DEFAULT sourceExample = os.path.join(Qt5Path.examplesPath(target), "quick/keyinteraction") proFile = "keyinteraction.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py index ab984d5225..4669c47b84 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -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.6", "5.10"] if template == "Qt Quick Application - Empty" else ["5.10"] + qtVersionsForQuick = ["5.10", "5.14"] for counter, qtVersion in enumerate(qtVersionsForQuick): def additionalFunc(displayedPlatforms, qtVersion): requiredQtVersion = __createProjectHandleQtQuickSelection__(qtVersion) diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index 5c296973b0..c39bdda57a 100644 --- a/tests/system/suite_general/tst_rename_file/test.py +++ b/tests/system/suite_general/tst_rename_file/test.py @@ -28,7 +28,7 @@ source("../../shared/qtcreator.py") def main(): # prepare example project projectName = "adding" - sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "qml", "referenceexamples", "adding") proFile = projectName + ".pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py index 96a3f33dd9..f33cdab833 100644 --- a/tests/system/suite_general/tst_session_handling/test.py +++ b/tests/system/suite_general/tst_session_handling/test.py @@ -39,7 +39,7 @@ def main(): "Verifying window title contains created session name.") checkWelcomePage(sessionName, True) for project in projects: - openQmakeProject(project, [Targets.DESKTOP_5_6_1_DEFAULT]) + openQmakeProject(project, [Targets.DESKTOP_5_14_1_DEFAULT]) waitForProjectParsing() checkNavigator(52, "Verifying whether all projects have been opened.") openDocument("animation.Resources.animation\\.qrc./animation.basics.animators\\.qml") @@ -67,9 +67,9 @@ def main(): invokeMenuItem("File", "Exit") def prepareTestExamples(): - examples = [os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + examples = [os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "quick", "animation", "animation.pro"), - os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "quick", "keyinteraction", "keyinteraction.pro") ] projects = [] diff --git a/tests/system/suite_qtquick/tst_qml_outline/test.py b/tests/system/suite_qtquick/tst_qml_outline/test.py index 4c0c5e8a03..b0cd8df316 100644 --- a/tests/system/suite_qtquick/tst_qml_outline/test.py +++ b/tests/system/suite_qtquick/tst_qml_outline/test.py @@ -30,7 +30,7 @@ outline = ":Qt Creator_QmlJSEditor::Internal::QmlJSOutlineTreeView" treebase = "keyinteraction.Resources.keyinteraction\\.qrc./keyinteraction.focus." def main(): - sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_14_1_DEFAULT), "quick", "keyinteraction") proFile = "keyinteraction.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): @@ -39,7 +39,7 @@ def main(): startQC() if not startedWithoutPluginError(): return - openQmakeProject(os.path.join(templateDir, proFile), [Targets.DESKTOP_5_6_1_DEFAULT]) + openQmakeProject(os.path.join(templateDir, proFile), [Targets.DESKTOP_5_14_1_DEFAULT]) qmlFiles = [treebase + "focus\\.qml", treebase + "Core.ListMenu\\.qml"] checkOutlineFor(qmlFiles) testModify() diff --git a/tests/system/suite_qtquick/tst_qtquick_creation/test.py b/tests/system/suite_qtquick/tst_qtquick_creation/test.py index d27b7fa9c0..d8a5cc8ee2 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation/test.py @@ -30,8 +30,8 @@ def main(): if not startedWithoutPluginError(): return - available = [("5.6", "Qt Quick Application - Empty", Targets.DESKTOP_5_6_1_DEFAULT), - ("5.10", "Qt Quick Application - Swipe", Targets.DESKTOP_5_10_1_DEFAULT)] + available = [("5.10", "Qt Quick Application - Empty", Targets.DESKTOP_5_10_1_DEFAULT), + ("5.14", "Qt Quick Application - Swipe", Targets.DESKTOP_5_14_1_DEFAULT)] for qtVersion, appTemplate, targ in available: # using a temporary directory won't mess up a potentially existing diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index adf7c4f62f..1b2613cda8 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -36,7 +36,7 @@ def main(): startQC() if not startedWithoutPluginError(): return - available = ["5.6", "5.10"] + available = ["5.10", "5.14"] for qtVersion in available: # using a temporary directory won't mess up a potentially existing @@ -45,9 +45,9 @@ def main(): checkedKitNames = Targets.getTargetsAsStrings(checkedKits) test.verify(_exactlyOne_(map(lambda name: qtVersion in name, checkedKitNames)), "The requested kit should have been checked") - if qtVersion == "5.10": - test.verify(not any(map(lambda name: "5.6" in name, checkedKitNames)), - "The 5.6 kit should not have been checked when 5.10 is required") + if qtVersion == "5.14": + test.verify(not any(map(lambda name: "5.10" in name, checkedKitNames)), + "The 5.10 kit should not have been checked when 5.14 is required") clickButton(waitForObject(":*Qt Creator.Run_Core::Internal::FancyToolButton")) if not waitForProcessRunning(): test.fatal("Couldn't start application - leaving test") diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py index 630cb35bae..82d04ef8d3 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py @@ -29,7 +29,7 @@ def main(): startQC() if not startedWithoutPluginError(): return - for target in [Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT]: + for target in [Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT]: # using a temporary directory won't mess up a potentially existing createNewQmlExtension(tempDir(), [target]) # wait for parsing to complete |