From fdc4ac41d92a97ed31bb9c3297ceb9f7cae1c748 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 21 Mar 2018 22:21:56 +0100 Subject: [PATCH] Squish: Replace Qt 5.3 kit with Qt 5.10 This patch just changes the minimum for replacing the kits while keeping the tests running. Further updates to the tests should be done in separate patches. Task-number: QTCREATORBUG-19440 Change-Id: I25ce60ad0a47678dba4352a4b2601ca1cdd4741d Reviewed-by: Christian Stenger --- tests/system/README | 37 +++++------ .../mac/QtProject/qtcreator/profiles.xml | 2 +- .../mac/QtProject/qtcreator/qtversion.xml | 6 +- .../unix/QtProject/qtcreator/profiles.xml | 57 +++++++++-------- .../unix/QtProject/qtcreator/qtversion.xml | 24 +++---- .../windows/QtProject/qtcreator/profiles.xml | 62 +++++++++---------- .../windows/QtProject/qtcreator/qtversion.xml | 24 +++---- .../QtProject/qtcreator/toolchains.xml | 53 ++++++++-------- tests/system/shared/classes.py | 24 +++---- tests/system/shared/project.py | 13 ++-- tests/system/suite_CSUP/tst_CSUP06/test.py | 2 +- tests/system/suite_QMLS/tst_QMLS03/test.py | 2 +- tests/system/suite_WELP/tst_WELP03/test.py | 2 +- .../suite_debugger/tst_simple_analyze/test.py | 2 +- .../testdata/events_qt5.10.1.tsv | 10 +++ .../{events_qt5.tsv => events_qt5.6.1.tsv} | 0 .../tst_create_proj_wizard/test.py | 6 +- .../suite_general/tst_openqt_creator/test.py | 2 +- .../suite_general/tst_rename_file/test.py | 2 + .../tst_session_handling/test.py | 2 +- .../suite_qtquick/tst_qml_outline/test.py | 2 +- .../tst_qtquick_creation3/test.py | 10 +-- .../tst_qtquick_creation4/test.py | 2 +- 23 files changed, 177 insertions(+), 169 deletions(-) create mode 100644 tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.10.1.tsv rename tests/system/suite_debugger/tst_simple_analyze/testdata/{events_qt5.tsv => events_qt5.6.1.tsv} (100%) diff --git a/tests/system/README b/tests/system/README index 94ddbbc4265..b309c607537 100644 --- a/tests/system/README +++ b/tests/system/README @@ -25,30 +25,25 @@ Second - some of the test suites/test cases expect a build of Qt 4.8.7 to be ava * Other: make -j -Third - some of the test suites/test cases expect Qt 5.3.1 (default toolchain), Qt 5.4.1 (gcc, Linux and Windows only) and Qt 5.6.1-1 (default toolchain) -installed in their default locations. On Linux/Mac this is ~/Qt5.x.1 and on Windows this is C:\Qt\Qt5.x.1. The default toolchains are gcc on Linux, -clang on Mac and MSVC2010 (Qt <= 5.5) or MSVC2013 (Qt > 5.5) on Windows. It's easiest to use default installations of the official opensource Qt packages. +Third - some of the test suites/test cases expect Qt versions to be installed in their default +locations. On Linux/macOS this is ~/Qt5.x.1 and on Windows this is C:\Qt\Qt5.x.1. It's easiest to +use installations of the official opensource Qt packages. Just install the Qt version for the +respective toolchain and if possible the additional module Qt Script. Do not install Qt WebEngine. +The exact versions and toolchains are: -On macOS it might be necessary to tweak some files of the Qt installation - depending on the installed Xcode and its installed SDKs. -If Xcode 8+ is installed you will need to update the file -~/Qt5.3.1/5.3/clang_64/mkspecs/features/mac/default_pre.prf -Change the line +Linux: +Qt 5.4.1 (gcc) +Qt 5.6.1-1 (gcc) +Qt 5.10.1 (gcc) - isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))) +macOS: +Qt 5.6.1-1 (clang) +Qt 5.10.1 (clang) -to - - isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))) - -Furthermore - depending on the installed SDK it might be necessary to update the file -~/Qt5.3.1/5.3/clang_64/mkspecs/qdevice.pri -Search for the following line - - !host_build:QMAKE_MAC_SDK = macosx10.8 - -Newer Xcode might miss the 10.8 SDK. Check -/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs -which SDKs are installed and update the version number accordingly. +Windows: +Qt 5.4.1 (gcc) +Qt 5.6.1-1 (MSVC2013, 32 bit) +Qt 5.10.1 (MSVC2015, 32 bit) Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below). These additional repositories are located inside ~/squish-data or C:\Users\\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 a3f0a20048a..c7548b95d16 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml @@ -101,7 +101,7 @@ :///DESKTOP/// {a1e860d1-c241-4abf-80fe-cf0c9f0a43b3} - Desktop 5.3.1 default + Desktop 5.10.1 default false diff --git a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml index 77b68271abb..f9a0babe523 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml @@ -16,7 +16,7 @@ QtVersion.1 9 - Desktop Qt 5.6.1 (SQUISH_DEFAULT_COMPILER) + Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER) ~/Qt5.6.1/5.6/SQUISH_DEFAULT_COMPILER/bin/qmake Qt4ProjectManager.QtVersion.Desktop false @@ -26,8 +26,8 @@ QtVersion.2 11 - Desktop Qt 5.3.1 (SQUISH_DEFAULT_COMPILER) - ~/Qt5.3.1/5.3/SQUISH_DEFAULT_COMPILER/bin/qmake + Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER) + ~/Qt5.10.1/5.10.1/SQUISH_DEFAULT_COMPILER/bin/qmake Qt4ProjectManager.QtVersion.Desktop false diff --git a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml index 1f56742fe09..627451db8b3 100644 --- a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml @@ -1,6 +1,6 @@ - + Profile.0 @@ -50,29 +50,6 @@ Profile.2 - - false - - - - {70e26273-2c0b-4534-bbc0-eb6ca670821a} - Desktop Device - Desktop - - ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371} - - 11 - - :///DESKTOP/// - {e91398ba-6443-4b02-b416-782a70d9df90} - - Desktop 5.3.1 default - false - - - - - Profile.3 false @@ -96,7 +73,7 @@ - Profile.4 + Profile.3 false @@ -119,13 +96,41 @@ + + Profile.4 + + false + + + + + {70e26273-2c0b-4534-bbc0-eb6ca670821a} + Desktop Device + Desktop + + + + {7bfd4fd4-e64a-417f-b10f-20602e1719d1} + {c3f59b87-6997-4bd8-8067-ee04dc536371} + + + 17 + + + {0d32ea2d-f954-4011-8f7c-80da4977c94c} + + Desktop 5.10.1 default + false + + + Profile.Count 5 Profile.Default - {e91398ba-6443-4b02-b416-782a70d9df90} + {542217c7-ce0f-48f7-843b-d4fad339688d} Version diff --git a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml index b6463a4f6e0..90e86a4f6a8 100644 --- a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml @@ -1,6 +1,6 @@ - + QtVersion.0 @@ -14,16 +14,6 @@ QtVersion.1 - - 11 - Qt 5.3.1 (SQUISH_DEFAULT_COMPILER) - ~/Qt5.3.1/5.3/SQUISH_DEFAULT_COMPILER/bin/qmake - Qt4ProjectManager.QtVersion.Desktop - false - - - - QtVersion.2 13 Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER) @@ -33,7 +23,7 @@ - QtVersion.3 + QtVersion.2 15 Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER) @@ -42,6 +32,16 @@ false + + QtVersion.3 + + 17 + Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER) + ~/Qt5.10.1/5.10.1/SQUISH_DEFAULT_COMPILER/bin/qmake + Qt4ProjectManager.QtVersion.Desktop + false + + Version 1 diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml index 70eda53be2e..ac1911748fb 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml @@ -1,6 +1,6 @@ - + Profile.0 @@ -32,34 +32,6 @@ Profile.1 - - false - - - - {1b25f20a-d584-4fb7-85b3-74dd15b82f6f} - Desktop Device - Desktop - - - ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2} - - {93e707bd-236f-4d8d-917d-814aa358024b} - ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2} - - - 20 - - :///DESKTOP/// - {6a95566e-8372-4372-8286-ef73af7de191} - - Desktop 5.3.1 default - false - - - - - Profile.2 false @@ -87,7 +59,7 @@ - Profile.3 + Profile.2 false @@ -114,13 +86,41 @@ + + Profile.3 + + false + + + + + {1b25f20a-d584-4fb7-85b3-74dd15b82f6f} + Desktop Device + Desktop + + + + {c96cfaf3-fb8a-472b-b3c7-e94e8c490f17} + {ed856706-2a9d-4745-9d85-4e322b6f91d4} + + + 26 + + + {37fad24d-07f3-442e-8c65-d9ded3633f7e} + + Desktop 5.10.1 default + false + + + Profile.Count 4 Profile.Default - {6a95566e-8372-4372-8286-ef73af7de191} + {f9c7858c-d167-4b78-847a-91943bd0af07} Version diff --git a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml index 713c9acea63..e9c384e6343 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml @@ -1,6 +1,6 @@ - + QtVersion.0 @@ -14,16 +14,6 @@ QtVersion.1 - - 20 - Qt 5.3.1 (msvc2010_opengl) - C:/Qt/Qt5.3.1/5.3/msvc2010_opengl/bin/qmake.exe - Qt4ProjectManager.QtVersion.Desktop - false - - - - QtVersion.2 22 Qt %{Qt:Version} (mingw491_32) @@ -33,7 +23,7 @@ - QtVersion.3 + QtVersion.2 24 Qt %{Qt:Version} (msvc2013) @@ -42,6 +32,16 @@ false + + QtVersion.3 + + 26 + Qt %{Qt:Version} (msvc2015) + C:/Qt/Qt5.10.1/5.10.1/msvc2015/bin/qmake.exe + Qt4ProjectManager.QtVersion.Desktop + false + + Version 1 diff --git a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml index 0db49a0028b..1dea56573ee 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml @@ -4,17 +4,6 @@ ToolChain.0 - - x86-windows-msvc2010-pe-32bit - c:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/vcvarsall.bat - x86 - true - Microsoft Visual C++ Compiler 10.0 (x86) - ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2} - - - - ToolChain.1 C:/Qt/Qt5.4.1/Tools/mingw491_32/bin/g++.exe @@ -29,19 +18,7 @@ - ToolChain.2 - - x86-windows-msvc2010-pe-32bit - C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/vcvarsall.bat - x86 - true - Microsoft Visual C++ Compiler 10.0 (x86) - ProjectExplorer.ToolChain.Msvc:{93e707bd-236f-4d8d-917d-814aa358024b} - 1 - - - - ToolChain.3 + ToolChain.1 x86-windows-msvc2013-pe-32bit C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat @@ -53,7 +30,7 @@ - ToolChain.4 + ToolChain.2 i686-w64-mingw32 C:/Qt/Qt5.4.1/Tools/mingw491_32/bin/gcc.exe @@ -69,6 +46,32 @@ 1 + + ToolChain.3 + + x86-windows-msvc2015-pe-32bit + C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat + x86 + true + Microsoft Visual C++ Compiler 14.0 (x86) + ProjectExplorer.ToolChain.Msvc:{c96cfaf3-fb8a-472b-b3c7-e94e8c490f17} + 1 + C + + + + ToolChain.4 + + x86-windows-msvc2015-pe-32bit + C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat + x86 + true + Microsoft Visual C++ Compiler 14.0 (x86) + ProjectExplorer.ToolChain.Msvc:{ed856706-2a9d-4745-9d85-4e322b6f91d4} + 2 + Cxx + + ToolChain.5 diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index 402181cfa54..d06398a159b 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -32,9 +32,9 @@ class Targets: (DESKTOP_4_8_7_DEFAULT, EMBEDDED_LINUX, - DESKTOP_5_3_1_DEFAULT, DESKTOP_5_4_1_GCC, - DESKTOP_5_6_1_DEFAULT) = ALL_TARGETS + DESKTOP_5_6_1_DEFAULT, + DESKTOP_5_10_1_DEFAULT) = ALL_TARGETS @staticmethod def availableTargetClasses(): @@ -62,12 +62,12 @@ class Targets: return "Desktop 4.8.7 default" elif target == Targets.EMBEDDED_LINUX: return "Embedded Linux" - elif target == Targets.DESKTOP_5_3_1_DEFAULT: - return "Desktop 5.3.1 default" elif target == Targets.DESKTOP_5_4_1_GCC: return "Desktop 5.4.1 GCC" elif target == Targets.DESKTOP_5_6_1_DEFAULT: return "Desktop 5.6.1 default" + elif target == Targets.DESKTOP_5_10_1_DEFAULT: + return "Desktop 5.10.1 default" else: return None @@ -83,7 +83,7 @@ class Targets: @staticmethod def getDefaultKit(): - return Targets.DESKTOP_5_3_1_DEFAULT + return Targets.DESKTOP_5_6_1_DEFAULT # this class holds some constants for easier usage inside the Projects view class ProjectSettings: @@ -169,7 +169,7 @@ class Qt5Path: @staticmethod def getPaths(pathSpec): - qt5targets = [Targets.DESKTOP_5_3_1_DEFAULT, Targets.DESKTOP_5_6_1_DEFAULT] + qt5targets = [Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT] if platform.system() != 'Darwin': qt5targets.append(Targets.DESKTOP_5_4_1_GCC) if pathSpec == Qt5Path.DOCS: @@ -223,20 +223,20 @@ class Qt5Path: @staticmethod def examplesPath(target): qtMinorVersion, qtPatchVersion = Qt5Path.getQtMinorAndPatchVersion(target) - if qtMinorVersion == 2: - path = "examples" - else: + if qtMinorVersion < 10: path = "Examples/Qt-5.%d" % qtMinorVersion + else: + path = "Examples/Qt-5.%d.%d" % (qtMinorVersion, qtPatchVersion) return os.path.join(Qt5Path.__createPlatformQtPath__(qtMinorVersion), path) @staticmethod def docsPath(target): qtMinorVersion, qtPatchVersion = Qt5Path.getQtMinorAndPatchVersion(target) - if qtMinorVersion == 2: - path = "doc" - else: + if qtMinorVersion < 10: path = "Docs/Qt-5.%d" % qtMinorVersion + else: + path = "Docs/Qt-5.%d.%d" % (qtMinorVersion, qtPatchVersion) return os.path.join(Qt5Path.__createPlatformQtPath__(qtMinorVersion), path) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 1a35e81aa50..6004986a78d 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -315,7 +315,7 @@ def createNewQtQuickUI(workingDir, qtVersion = "5.6"): return projectName -def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_5_3_1_DEFAULT]): +def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_5_6_1_DEFAULT]): available = __createProjectOrFileSelectType__(" Library", "Qt Quick 2 Extension Plugin") if workingDir == None: workingDir = tempDir() @@ -639,10 +639,11 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): version = res.group("version") else: version = None - if 'only available with Qt 5.6' in text: - result = [Targets.DESKTOP_5_6_1_DEFAULT] - elif 'available with Qt 5.7 and later' in text: - result = [] # FIXME we have currently no Qt5.7+ available in predefined settings + if templateName.startswith("Qt Quick Application - "): + if templateName == "Qt Quick Application - Empty": + result = [Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT] + else: + result = [Targets.DESKTOP_5_10_1_DEFAULT] elif 'Supported Platforms' in text: supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ") result = [] @@ -651,7 +652,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): result.append(Targets.DESKTOP_4_8_7_DEFAULT) if platform.system() in ("Linux", "Darwin"): result.append(Targets.EMBEDDED_LINUX) - result.extend([Targets.DESKTOP_5_3_1_DEFAULT, Targets.DESKTOP_5_6_1_DEFAULT]) + result.extend([Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT]) if platform.system() != 'Darwin': result.append(Targets.DESKTOP_5_4_1_GCC) elif 'Platform independent' in text: diff --git a/tests/system/suite_CSUP/tst_CSUP06/test.py b/tests/system/suite_CSUP/tst_CSUP06/test.py index 40d924d2c5b..baf42187775 100644 --- a/tests/system/suite_CSUP/tst_CSUP06/test.py +++ b/tests/system/suite_CSUP/tst_CSUP06/test.py @@ -165,7 +165,7 @@ def main(): with TestSection(getCodeModelString(useClang)): if not startCreator(useClang): continue - openQmakeProject(examplePath, [Targets.DESKTOP_5_3_1_DEFAULT]) + openQmakeProject(examplePath, [Targets.DESKTOP_5_6_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 11408d700b5..0287c352f36 100644 --- a/tests/system/suite_QMLS/tst_QMLS03/test.py +++ b/tests/system/suite_QMLS/tst_QMLS03/test.py @@ -80,7 +80,7 @@ def main(): if not startedWithoutPluginError(): return # open example project - openQmakeProject(examplePath, [Targets.DESKTOP_5_3_1_DEFAULT]) + openQmakeProject(examplePath, [Targets.DESKTOP_5_6_1_DEFAULT]) # open qml file openDocument("animation.Resources.animation\\.qrc./animation.basics.color-animation\\.qml") # get editor diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index 3347f34f373..34d0de76aa0 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -123,7 +123,7 @@ def main(): for p in proFiles: removePackagingDirectory(os.path.dirname(p)) examplesLineEdit = waitForObject(search %(expect[1][0], expect[1][1])) - example = openExample(examplesLineEdit, "address book", "Address Book.*", + example = openExample(examplesLineEdit, "address book", "(0000 )?Address Book.*", "Address Book Example") if example is not None: # close second example application diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py index 07166a8bf4d..c366d535bc8 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/test.py +++ b/tests/system/suite_debugger/tst_simple_analyze/test.py @@ -108,7 +108,7 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): colMean, colMedian, colLongest, colShortest) = range(2, 11) model = waitForObject(":Events.QmlProfilerEventsTable_QmlProfiler::" "Internal::QmlProfilerStatisticsMainView").model() - compareEventsTab(model, "events_qt5.tsv") + compareEventsTab(model, "events_qt%s.tsv" % qtVersion) test.compare(dumpItems(model, column=colPercent)[0], '100.00 %') # cannot run following test on colShortest (unstable) for i in [colTotal, colMean, colMedian, colLongest]: diff --git a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.10.1.tsv b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.10.1.tsv new file mode 100644 index 00000000000..4038c164c97 --- /dev/null +++ b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.10.1.tsv @@ -0,0 +1,10 @@ +"0" "1" "6" "11" +"" "" "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:0" "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" +"" "Binding" "1" "Source code not available" diff --git a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.6.1.tsv similarity index 100% rename from tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv rename to tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.6.1.tsv 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 99e41de9751..adfe3d60442 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -27,7 +27,6 @@ source("../../shared/qtcreator.py") def main(): global tmpSettingsDir, availableBuildSystems - qtVersionsForQuick = ["5.6"] availableBuildSystems = ["qmake", "Qbs"] if which("cmake"): availableBuildSystems.append("CMake") @@ -72,6 +71,7 @@ def main(): template = current.values()[0] displayedPlatforms = __createProject__(category, template) if template.startswith("Qt Quick Application - "): + qtVersionsForQuick = ["5.6", "5.10"] if template == "Qt Quick Application - Empty" else ["5.10"] for counter, qtVersion in enumerate(qtVersionsForQuick): def additionalFunc(displayedPlatforms, qtVersion): requiredQtVersion = __createProjectHandleQtQuickSelection__(qtVersion) @@ -128,9 +128,7 @@ def handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms, test.log("Using build system '%s'" % buildSystem) selectFromCombo(combo, buildSystem) clickButton(waitForObject(":Next_QPushButton")) - if (template.startswith("Qt Quick Application - ") - and template != "Qt Quick Application - Empty"): - test.warning("No suitable Qt version available for '%s'" % template) + if template == "Qt Quick Application - Scroll": clickButton(waitForObject(":Next_QPushButton")) elif specialHandlingFunc: specialHandlingFunc(displayedPlatforms, *args) diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py index 6d401784704..391c3d0bef7 100644 --- a/tests/system/suite_general/tst_openqt_creator/test.py +++ b/tests/system/suite_general/tst_openqt_creator/test.py @@ -64,7 +64,7 @@ def main(): openGeneralMessages() # Verify messages appear once, from using default kit before configuring generalMessages = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText) - test.compare(generalMessages.count("Project MESSAGE: Cannot build Qt Creator with Qt version 5.3.1."), 1, + test.compare(generalMessages.count("Project MESSAGE: Cannot build Qt Creator with Qt version 5.6.1."), 2, "Warning about outdated Qt shown?") test.compare(generalMessages.count("Project ERROR: Use at least Qt 5.6.2."), 2, "Minimum Qt version shown (once when parsing with default kit, once with selected)?") diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index 7bf2c882ea7..0063b638e59 100644 --- a/tests/system/suite_general/tst_rename_file/test.py +++ b/tests/system/suite_general/tst_rename_file/test.py @@ -53,6 +53,8 @@ def main(): ["Resources", "adding.qrc"], ["QML", "example.qml"]]: filenames = ["ABCD" + filename.upper(), "abcd" + filename.lower(), "test", "TEST", filename] + if (filename.endswith(".qrc") and JIRA.isBugStillOpen(20101)): + filenames.remove("ABCD" + filename.upper()) previous = filenames[-1] for filename in filenames: tempFiletype = filetype diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py index 673aae739a6..bbce227979b 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_3_1_DEFAULT]) + openQmakeProject(project, [Targets.DESKTOP_5_6_1_DEFAULT]) progressBarWait(20000) checkNavigator(52, "Verifying whether all projects have been opened.") openDocument("animation.Resources.animation\\.qrc./animation.basics.animators\\.qml") diff --git a/tests/system/suite_qtquick/tst_qml_outline/test.py b/tests/system/suite_qtquick/tst_qml_outline/test.py index f3ca4885ac1..e14c5eb5394 100644 --- a/tests/system/suite_qtquick/tst_qml_outline/test.py +++ b/tests/system/suite_qtquick/tst_qml_outline/test.py @@ -39,7 +39,7 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - openQmakeProject(os.path.join(templateDir, proFile), [Targets.DESKTOP_5_3_1_DEFAULT]) + openQmakeProject(os.path.join(templateDir, proFile), [Targets.DESKTOP_5_6_1_DEFAULT]) qmlFiles = [treebase + "focus\\.qml", treebase + "Core.ListMenu\\.qml"] checkOutlineFor(qmlFiles) testModify() diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index b47da5d58d7..24a43f18e75 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -35,14 +35,8 @@ def main(): # using a temporary directory won't mess up a potentially existing workingDir = tempDir() projectName = createNewQtQuickUI(workingDir, qtVersion) - kit = Targets.getStringForTarget(Targets.DESKTOP_5_6_1_DEFAULT) - if addAndActivateKit(Targets.DESKTOP_5_6_1_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) + quick = "2.6" + qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(1, 0, workingDir, projectName, 11223, quick) if qmlViewer!=None: qmlViewerPath = os.path.dirname(qmlViewer) qmlViewer = os.path.basename(qmlViewer) diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py index a39ac6f8670..a1bda108ec2 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(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - for target in [Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_3_1_DEFAULT]: + for target in [Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_10_1_DEFAULT]: # using a temporary directory won't mess up a potentially existing createNewQmlExtension(tempDir(), [target]) # wait for parsing to complete