From a4ff3423e9b6793c04f21f084e7b8139b4422714 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 4 Jan 2018 12:11:55 +0100 Subject: Squish: Update Qt version names and constants As a preparation for using Qt 5.10, these need to handle two-digit minor versions. Change-Id: I2a47606ee801a28df12d75323b480f8ee583893b Reviewed-by: Christian Stenger --- .../settings/mac/QtProject/qtcreator/profiles.xml | 6 +-- .../settings/unix/QtProject/qtcreator/profiles.xml | 8 ++-- .../windows/QtProject/qtcreator/profiles.xml | 8 ++-- tests/system/shared/classes.py | 52 +++++++++++++--------- tests/system/shared/project.py | 45 +++++++++---------- tests/system/suite_APTW/tst_APTW03/test.py | 2 +- tests/system/suite_CCOM/tst_CCOM01/test.py | 4 +- tests/system/suite_CCOM/tst_CCOM02/test.py | 2 +- tests/system/suite_CSUP/tst_CSUP06/test.py | 2 +- tests/system/suite_QMLS/tst_QMLS03/test.py | 4 +- tests/system/suite_WELP/tst_WELP02/test.py | 2 +- .../suite_debugger/tst_cli_output_console/test.py | 4 +- .../suite_debugger/tst_debug_empty_main/test.py | 3 +- tests/system/suite_editors/tst_qml_editor/test.py | 2 +- .../suite_general/tst_build_speedcrunch/test.py | 2 +- .../suite_general/tst_opencreator_qbs/test.py | 4 +- .../suite_general/tst_openqt_creator/test.py | 4 +- tests/system/suite_general/tst_remove_kits/test.py | 2 +- tests/system/suite_general/tst_rename_file/test.py | 2 +- .../suite_general/tst_session_handling/test.py | 6 +-- tests/system/suite_qtquick/tst_qml_outline/test.py | 4 +- .../suite_qtquick/tst_qtquick_creation/test.py | 2 +- .../suite_qtquick/tst_qtquick_creation3/test.py | 4 +- .../suite_qtquick/tst_qtquick_creation4/test.py | 2 +- 24 files changed, 90 insertions(+), 86 deletions(-) (limited to 'tests') diff --git a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml index 3df47f6a77f..a3f0a20048a 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml @@ -49,7 +49,7 @@ :///DESKTOP/// {fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a} - Desktop 561 default + Desktop 5.6.1 default false @@ -75,7 +75,7 @@ :///DESKTOP/// {1dcb5509-1670-470d-80a5-8a988f36e4e2} - Desktop 487 default + Desktop 4.8.7 default false @@ -101,7 +101,7 @@ :///DESKTOP/// {a1e860d1-c241-4abf-80fe-cf0c9f0a43b3} - Desktop 531 default + Desktop 5.3.1 default false diff --git a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml index 265a81a89b0..1f56742fe09 100644 --- a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml @@ -44,7 +44,7 @@ :///DESKTOP/// {1dcb5509-1670-470d-80a5-8a988f36e4e2} - Desktop 487 default + Desktop 4.8.7 default false @@ -66,7 +66,7 @@ :///DESKTOP/// {e91398ba-6443-4b02-b416-782a70d9df90} - Desktop 531 default + Desktop 5.3.1 default false @@ -90,7 +90,7 @@ :///DESKTOP/// {8ca91e21-c12e-4876-85b3-4b2141708acb} - Desktop 541 GCC + Desktop 5.4.1 GCC false @@ -114,7 +114,7 @@ :///DESKTOP/// {542217c7-ce0f-48f7-843b-d4fad339688d} - Desktop 561 default + Desktop 5.6.1 default false diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml index 8baf4c029a1..70eda53be2e 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml @@ -25,7 +25,7 @@ :///DESKTOP/// {9b35bbe6-25a7-4cce-ba07-487c795f5265} - Desktop 487 default + Desktop 4.8.7 default false @@ -53,7 +53,7 @@ :///DESKTOP/// {6a95566e-8372-4372-8286-ef73af7de191} - Desktop 531 default + Desktop 5.3.1 default false @@ -81,7 +81,7 @@ :///DESKTOP/// {10cf33c5-e36d-4a49-a8c7-086f3cf59695} - Desktop 541 GCC + Desktop 5.4.1 GCC false @@ -109,7 +109,7 @@ :///DESKTOP/// {f9c7858c-d167-4b78-847a-91943bd0af07} - Desktop 561 default + Desktop 5.6.1 default false diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index eb74c9ad0db..402181cfa54 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -30,11 +30,11 @@ import operator class Targets: ALL_TARGETS = tuple(map(lambda x: 2 ** x , range(5))) - (DESKTOP_487_DEFAULT, + (DESKTOP_4_8_7_DEFAULT, EMBEDDED_LINUX, - DESKTOP_531_DEFAULT, - DESKTOP_541_GCC, - DESKTOP_561_DEFAULT) = ALL_TARGETS + DESKTOP_5_3_1_DEFAULT, + DESKTOP_5_4_1_GCC, + DESKTOP_5_6_1_DEFAULT) = ALL_TARGETS @staticmethod def availableTargetClasses(): @@ -42,7 +42,7 @@ class Targets: if platform.system() in ('Windows', 'Microsoft'): availableTargets.remove(Targets.EMBEDDED_LINUX) elif platform.system() == 'Darwin': - availableTargets.remove(Targets.DESKTOP_541_GCC) + availableTargets.remove(Targets.DESKTOP_5_4_1_GCC) return availableTargets @staticmethod @@ -54,20 +54,20 @@ class Targets: @staticmethod def qt4Classes(): - return (Targets.DESKTOP_487_DEFAULT | Targets.EMBEDDED_LINUX) + return (Targets.DESKTOP_4_8_7_DEFAULT | Targets.EMBEDDED_LINUX) @staticmethod def getStringForTarget(target): - if target == Targets.DESKTOP_487_DEFAULT: - return "Desktop 487 default" + if target == Targets.DESKTOP_4_8_7_DEFAULT: + return "Desktop 4.8.7 default" elif target == Targets.EMBEDDED_LINUX: return "Embedded Linux" - elif target == Targets.DESKTOP_531_DEFAULT: - return "Desktop 531 default" - elif target == Targets.DESKTOP_541_GCC: - return "Desktop 541 GCC" - elif target == Targets.DESKTOP_561_DEFAULT: - return "Desktop 561 default" + 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" else: return None @@ -83,7 +83,7 @@ class Targets: @staticmethod def getDefaultKit(): - return Targets.DESKTOP_531_DEFAULT + return Targets.DESKTOP_5_3_1_DEFAULT # this class holds some constants for easier usage inside the Projects view class ProjectSettings: @@ -169,9 +169,9 @@ class Qt5Path: @staticmethod def getPaths(pathSpec): - qt5targets = [Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_561_DEFAULT] + qt5targets = [Targets.DESKTOP_5_3_1_DEFAULT, Targets.DESKTOP_5_6_1_DEFAULT] if platform.system() != 'Darwin': - qt5targets.append(Targets.DESKTOP_541_GCC) + qt5targets.append(Targets.DESKTOP_5_4_1_GCC) if pathSpec == Qt5Path.DOCS: return map(lambda target: Qt5Path.docsPath(target), qt5targets) elif pathSpec == Qt5Path.EXAMPLES: @@ -185,7 +185,7 @@ class Qt5Path: if target not in Targets.ALL_TARGETS: raise Exception("Unexpected target '%s'" % str(target)) - matcher = re.match("^Desktop (5\\d{2}).*$", Targets.getStringForTarget(target)) + matcher = re.match("^Desktop (5\.\\d{1,2}\.\\d{1,2}).*$", Targets.getStringForTarget(target)) if matcher is None: raise Exception("Currently this is supported for Desktop Qt5 only, got target '%s'" % str(Targets.getStringForTarget(target))) @@ -211,9 +211,18 @@ class Qt5Path: return os.path.expanduser("~/Qt5.%d.1" % qt5Minor) @staticmethod - def examplesPath(target): + def toVersionTuple(versionString): + return tuple(map(__builtin__.int, versionString.split("."))) + + @staticmethod + def getQtMinorAndPatchVersion(target): qtVersionStr = Qt5Path.__preCheckAndExtractQtVersionStr__(target) - qtMinorVersion = __builtin__.int(qtVersionStr[1]) + versionTuple = Qt5Path.toVersionTuple(qtVersionStr) + return versionTuple[1], versionTuple[2] + + @staticmethod + def examplesPath(target): + qtMinorVersion, qtPatchVersion = Qt5Path.getQtMinorAndPatchVersion(target) if qtMinorVersion == 2: path = "examples" else: @@ -223,8 +232,7 @@ class Qt5Path: @staticmethod def docsPath(target): - qtVersionStr = Qt5Path.__preCheckAndExtractQtVersionStr__(target) - qtMinorVersion = __builtin__.int(qtVersionStr[1]) + qtMinorVersion, qtPatchVersion = Qt5Path.getQtMinorAndPatchVersion(target) if qtMinorVersion == 2: path = "doc" else: diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 06b67e18c74..1a35e81aa50 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -73,7 +73,7 @@ def openCmakeProject(projectPath, buildDir): invokeMenuItem("File", "Open File or Project...") selectFromFileDialog(projectPath) __chooseTargets__([]) # uncheck all - __chooseTargets__([Targets.DESKTOP_487_DEFAULT], additionalFunc=additionalFunction) + __chooseTargets__([Targets.DESKTOP_4_8_7_DEFAULT], additionalFunc=additionalFunction) clickButton(waitForObject(":Qt Creator.Configure Project_QPushButton")) return True @@ -190,28 +190,23 @@ def __verifyFileCreation__(path, expectedFiles): test.verify(os.path.exists(filename), "Checking if '" + filename + "' was created") def __modifyAvailableTargets__(available, requiredQt, asStrings=False): - threeDigits = re.compile("\d{3}") - requiredQtVersion = requiredQt.replace(".", "") + "0" + versionFinder = re.compile("^Desktop (\\d{1}\.\\d{1,2}\.\\d{1,2}).*$") tmp = list(available) # we need a deep copy + if Qt5Path.toVersionTuple(requiredQt) > (4,8,7): + toBeRemoved = Targets.EMBEDDED_LINUX + if asStrings: + toBeRemoved = Targets.getStringForTarget(toBeRemoved) + if toBeRemoved in available: + available.remove(toBeRemoved) for currentItem in tmp: if asStrings: item = currentItem else: item = Targets.getStringForTarget(currentItem) - found = threeDigits.search(item) + found = versionFinder.search(item) if found: - if found.group(0) < requiredQtVersion: - # Quick 1.1 supports 4.7.4 only for running, debugging is unsupported - # so the least required version is 4.8, but 4.7.4 will be still listed - if not (requiredQtVersion == "480" and found.group(0) == "474"): - available.remove(currentItem) - if requiredQtVersion > "487": - toBeRemoved = [Targets.EMBEDDED_LINUX] - if asStrings: - toBeRemoved = Targets.getTargetsAsStrings(toBeRemoved) - for t in toBeRemoved: - if t in available: - available.remove(t) + if Qt5Path.toVersionTuple(found.group(1)) < Qt5Path.toVersionTuple(requiredQt): + available.remove(currentItem) # Creates a Qt GUI project # param path specifies where to create the project @@ -320,7 +315,7 @@ def createNewQtQuickUI(workingDir, qtVersion = "5.6"): return projectName -def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_531_DEFAULT]): +def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_5_3_1_DEFAULT]): available = __createProjectOrFileSelectType__(" Library", "Qt Quick 2 Extension Plugin") if workingDir == None: workingDir = tempDir() @@ -349,7 +344,7 @@ def createEmptyQtProject(workingDir=None, projectName=None, targets=Targets.desk __createProjectHandleLastPage__() return projectName, checkedTargets -def createNewNonQtProject(workingDir=None, projectName=None, target=[Targets.DESKTOP_487_DEFAULT], +def createNewNonQtProject(workingDir=None, projectName=None, target=[Targets.DESKTOP_4_8_7_DEFAULT], plainC=False, cmake=False, qbs=False): if plainC: template = "Plain C Application" @@ -378,7 +373,7 @@ def createNewNonQtProject(workingDir=None, projectName=None, target=[Targets.DES return projectName def createNewCPPLib(projectDir = None, projectName = None, className = None, fromWelcome = False, - target = [Targets.DESKTOP_487_DEFAULT], isStatic = False, modules = ["QtCore"]): + target = [Targets.DESKTOP_4_8_7_DEFAULT], isStatic = False, modules = ["QtCore"]): available = __createProjectOrFileSelectType__(" Library", "C++ Library", fromWelcome, True) if isStatic: libType = LibType.STATIC @@ -396,7 +391,7 @@ def createNewCPPLib(projectDir = None, projectName = None, className = None, fro return checkedTargets, projectName, className def createNewQtPlugin(projectDir=None, projectName=None, className=None, fromWelcome=False, - target=[Targets.DESKTOP_487_DEFAULT], baseClass="QGenericPlugin"): + target=[Targets.DESKTOP_4_8_7_DEFAULT], baseClass="QGenericPlugin"): available = __createProjectOrFileSelectType__(" Library", "C++ Library", fromWelcome, True) if projectDir == None: projectDir = tempDir() @@ -414,7 +409,7 @@ def createNewQtPlugin(projectDir=None, projectName=None, className=None, fromWel # parameter additionalFunc function to be executed inside the detailed view of each chosen kit # if present, 'Details' button will be clicked, function will be executed, # 'Details' button will be clicked again -def __chooseTargets__(targets=[Targets.DESKTOP_487_DEFAULT], availableTargets=None, additionalFunc=None): +def __chooseTargets__(targets=[Targets.DESKTOP_4_8_7_DEFAULT], availableTargets=None, additionalFunc=None): if availableTargets != None: available = availableTargets else: @@ -645,7 +640,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): else: version = None if 'only available with Qt 5.6' in text: - result = [Targets.DESKTOP_561_DEFAULT] + 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 elif 'Supported Platforms' in text: @@ -653,12 +648,12 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): result = [] if 'Desktop' in supports: if version == None or version < "5.0": - result.append(Targets.DESKTOP_487_DEFAULT) + result.append(Targets.DESKTOP_4_8_7_DEFAULT) if platform.system() in ("Linux", "Darwin"): result.append(Targets.EMBEDDED_LINUX) - result.extend([Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_561_DEFAULT]) + result.extend([Targets.DESKTOP_5_3_1_DEFAULT, Targets.DESKTOP_5_6_1_DEFAULT]) if platform.system() != 'Darwin': - result.append(Targets.DESKTOP_541_GCC) + result.append(Targets.DESKTOP_5_4_1_GCC) elif 'Platform independent' in text: result = Targets.desktopTargetClasses() else: diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py index d1ef6a5f804..2ceef47b708 100644 --- a/tests/system/suite_APTW/tst_APTW03/test.py +++ b/tests/system/suite_APTW/tst_APTW03/test.py @@ -85,7 +85,7 @@ def main(): target=targets) virtualFunctionsAdded = False for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"): - is487Kit = "487" in Targets.getStringForTarget(checkedTargets[kit]) + is487Kit = checkedTargets[kit] in (Targets.DESKTOP_4_8_7_DEFAULT, Targets.EMBEDDED_LINUX) verifyBuildConfig(len(checkedTargets), kit, config, True, True) if virtualFunctionsAdded and platform.system() in ('Microsoft', 'Windows') and is487Kit: test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.") diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py index 8e336c8567a..6e75e634f2e 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_561_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), "quick", "animation") proFile = "animation.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): @@ -41,7 +41,7 @@ def main(): return # open example project, supports only Qt 5 targets = Targets.desktopTargetClasses() - targets.remove(Targets.DESKTOP_487_DEFAULT) + targets.remove(Targets.DESKTOP_4_8_7_DEFAULT) checkedTargets = openQmakeProject(examplePath, targets) # build and wait until finished - on all build configurations availableConfigs = iterateBuildConfigs(len(checkedTargets)) diff --git a/tests/system/suite_CCOM/tst_CCOM02/test.py b/tests/system/suite_CCOM/tst_CCOM02/test.py index 2a59212706b..f6a3232bd88 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_561_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), "quick", "animation") proFile = "animation.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 f703669755e..40d924d2c5b 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_531_DEFAULT]) + openQmakeProject(examplePath, [Targets.DESKTOP_5_3_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 3682816da52..11408d700b5 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_561_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_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_531_DEFAULT]) + openQmakeProject(examplePath, [Targets.DESKTOP_5_3_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_WELP02/test.py b/tests/system/suite_WELP/tst_WELP02/test.py index ae7b22e9345..e809a753df7 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_561_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), "quick", "animation") if not neededFilePresent(sourceExample): return diff --git a/tests/system/suite_debugger/tst_cli_output_console/test.py b/tests/system/suite_debugger/tst_cli_output_console/test.py index 7acaedc0fe3..1add5fe028c 100644 --- a/tests/system/suite_debugger/tst_cli_output_console/test.py +++ b/tests/system/suite_debugger/tst_cli_output_console/test.py @@ -71,10 +71,10 @@ def main(): appOutput = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText) verifyOutput(appOutput, outputStdOut, "std::cout", "Application Output") verifyOutput(appOutput, outputStdErr, "std::cerr", "Application Output") - if (checkedTargets[kit] == Targets.DESKTOP_541_GCC + if (checkedTargets[kit] == Targets.DESKTOP_5_4_1_GCC and platform.system() in ('Windows', 'Microsoft')): test.log("Skipping qDebug() from %s (unstable, QTCREATORBUG-15067)" - % Targets.getStringForTarget(Targets.DESKTOP_541_GCC)) + % Targets.getStringForTarget(Targets.DESKTOP_5_4_1_GCC)) else: verifyOutput(appOutput, outputQDebug, "qDebug()", "Application Output") diff --git a/tests/system/suite_debugger/tst_debug_empty_main/test.py b/tests/system/suite_debugger/tst_debug_empty_main/test.py index 524499c8162..230e3793a87 100644 --- a/tests/system/suite_debugger/tst_debug_empty_main/test.py +++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py @@ -61,7 +61,8 @@ def main(): for name,isC in {"C":True, "CPP":False}.items(): for singleTarget in targets: workingDir = tempDir() - qtVersion = re.search("\d{3}", Targets.getStringForTarget(singleTarget)).group() + qtVersion = re.search("\\d{1}\.\\d{1,2}\.\\d{1,2}", Targets.getStringForTarget(singleTarget)).group() + qtVersion = qtVersion.replace(".", "") projectName = createNewNonQtProject(workingDir, "Sample%s%s" % (name, qtVersion), [singleTarget], isC) if projectName == None: diff --git a/tests/system/suite_editors/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py index 8854035e6a9..c61b7aa43de 100644 --- a/tests/system/suite_editors/tst_qml_editor/test.py +++ b/tests/system/suite_editors/tst_qml_editor/test.py @@ -26,7 +26,7 @@ source("../../shared/qtcreator.py") def main(): - target = Targets.DESKTOP_531_DEFAULT + target = Targets.DESKTOP_5_3_1_DEFAULT sourceExample = os.path.join(Qt5Path.examplesPath(target), "declarative/keyinteraction/focus") proFile = "focus.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py index 34be2beafa5..686943b422a 100644 --- a/tests/system/suite_general/tst_build_speedcrunch/test.py +++ b/tests/system/suite_general/tst_build_speedcrunch/test.py @@ -42,7 +42,7 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - checkedTargets = openQmakeProject(SpeedCrunchPath, [Targets.DESKTOP_487_DEFAULT]) + checkedTargets = openQmakeProject(SpeedCrunchPath, [Targets.DESKTOP_4_8_7_DEFAULT]) progressBarWait(30000) fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton") diff --git a/tests/system/suite_general/tst_opencreator_qbs/test.py b/tests/system/suite_general/tst_opencreator_qbs/test.py index e8b17b607d4..60cc0d34444 100644 --- a/tests/system/suite_general/tst_opencreator_qbs/test.py +++ b/tests/system/suite_general/tst_opencreator_qbs/test.py @@ -37,8 +37,8 @@ def main(): if not startedWithoutPluginError(): return openQbsProject(pathCreator) - if not addAndActivateKit(Targets.DESKTOP_561_DEFAULT): - test.fatal("Failed to activate '%s'" % Targets.getStringForTarget(Targets.DESKTOP_541_GCC)) + if not addAndActivateKit(Targets.DESKTOP_5_6_1_DEFAULT): + test.fatal("Failed to activate '%s'" % Targets.getStringForTarget(Targets.DESKTOP_5_4_1_GCC)) invokeMenuItem("File", "Exit") return test.log("Start parsing project") diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py index b2846b5e971..6d401784704 100644 --- a/tests/system/suite_general/tst_openqt_creator/test.py +++ b/tests/system/suite_general/tst_openqt_creator/test.py @@ -36,12 +36,12 @@ def main(): return runButton = findObject(':*Qt Creator.Run_Core::Internal::FancyToolButton') - openQmakeProject(pathSpeedcrunch, [Targets.DESKTOP_487_DEFAULT]) + openQmakeProject(pathSpeedcrunch, [Targets.DESKTOP_4_8_7_DEFAULT]) # Wait for parsing to complete waitFor("runButton.enabled", 30000) # Starting before opening, because this is where Creator froze (QTCREATORBUG-10733) startopening = datetime.utcnow() - openQmakeProject(pathCreator, [Targets.DESKTOP_561_DEFAULT]) + openQmakeProject(pathCreator, [Targets.DESKTOP_5_6_1_DEFAULT]) # Wait for parsing to complete startreading = datetime.utcnow() waitFor("runButton.enabled", 300000) diff --git a/tests/system/suite_general/tst_remove_kits/test.py b/tests/system/suite_general/tst_remove_kits/test.py index 98590d674a4..b5b51487417 100644 --- a/tests/system/suite_general/tst_remove_kits/test.py +++ b/tests/system/suite_general/tst_remove_kits/test.py @@ -46,7 +46,7 @@ def __removeKit__(kit, kitName): if kitName == Targets.getStringForTarget(Targets.getDefaultKit()): # The following kits will be the default kit at that time kitNameTemplate += " (default)" - item = kitNameTemplate % kitName + item = kitNameTemplate % kitName.replace(".", "\\.") waitForObjectItem(":BuildAndRun_QTreeView", item) clickItem(":BuildAndRun_QTreeView", item, 5, 5, 0, Qt.LeftButton) clickButton(waitForObject(":Remove_QPushButton")) diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index 7aa17f2e052..ee55e9c2b47 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_561_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_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 754f42bd1e0..673aae739a6 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_531_DEFAULT]) + openQmakeProject(project, [Targets.DESKTOP_5_3_1_DEFAULT]) progressBarWait(20000) checkNavigator(52, "Verifying whether all projects have been opened.") openDocument("animation.Resources.animation\\.qrc./animation.basics.animators\\.qml") @@ -66,9 +66,9 @@ def main(): invokeMenuItem("File", "Exit") def prepareTestExamples(): - examples = [os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_561_DEFAULT), + examples = [os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), "quick", "animation", "animation.pro"), - os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_561_DEFAULT), + os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_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 383d8296f73..f3ca4885ac1 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_561_DEFAULT), + sourceExample = os.path.join(Qt5Path.examplesPath(Targets.DESKTOP_5_6_1_DEFAULT), "quick", "keyinteraction") proFile = "keyinteraction.pro" if not neededFilePresent(os.path.join(sourceExample, proFile)): @@ -39,7 +39,7 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - openQmakeProject(os.path.join(templateDir, proFile), [Targets.DESKTOP_531_DEFAULT]) + openQmakeProject(os.path.join(templateDir, proFile), [Targets.DESKTOP_5_3_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 2b767cde896..0487240ecb7 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation/test.py @@ -33,7 +33,7 @@ def main(): available = [("5.6", False), ("5.6", True)] for qtVersion, controls in available: - targ = [Targets.DESKTOP_561_DEFAULT] + targ = [Targets.DESKTOP_5_6_1_DEFAULT] quick = "2.6" # using a temporary directory won't mess up a potentially existing workingDir = tempDir() diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index 507abffba38..b47da5d58d7 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -35,8 +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_561_DEFAULT) - if addAndActivateKit(Targets.DESKTOP_561_DEFAULT): + 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) diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py index 3fc99ae0bfa..a39ac6f8670 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_561_DEFAULT, Targets.DESKTOP_531_DEFAULT]: + for target in [Targets.DESKTOP_5_6_1_DEFAULT, Targets.DESKTOP_5_3_1_DEFAULT]: # using a temporary directory won't mess up a potentially existing createNewQmlExtension(tempDir(), [target]) # wait for parsing to complete -- cgit v1.2.3