diff options
author | Robert Loehning <robert.loehning@qt.io> | 2017-06-14 16:11:19 +0200 |
---|---|---|
committer | Robert Loehning <robert.loehning@qt.io> | 2017-07-31 14:04:00 +0000 |
commit | 11abd8edf71aa3a62d93b95977f722d761d1df32 (patch) | |
tree | 5c75e398b8bcc1dfb4aa54407057a285f2c91fe6 /tests/system/suite_APTW | |
parent | 4af7792ad3bf03c756749525e93d2cec01fe11e6 (diff) |
Squish: Replace Qt4 SDK by self-built Qt 4.8.7
Change-Id: If990367afb01aae94755930c02c81ae82b23bb8f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/system/suite_APTW')
-rw-r--r-- | tests/system/suite_APTW/tst_APTW03/test.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py index 1b8090fcdce..d1ef6a5f804 100644 --- a/tests/system/suite_APTW/tst_APTW03/test.py +++ b/tests/system/suite_APTW/tst_APTW03/test.py @@ -81,14 +81,13 @@ def main(): # Qt Plugin needs Qt4.8 for QGenericPlugin which is tested by default targets = Targets.desktopTargetClasses() - targets.remove(Targets.DESKTOP_474_GCC) checkedTargets, projectName, className = createNewQtPlugin(tempDir(), "SampleApp3", "MyPlugin", target=targets) virtualFunctionsAdded = False for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"): - is480Kit = "480" in Targets.getStringForTarget(checkedTargets[kit]) + is487Kit = "487" in Targets.getStringForTarget(checkedTargets[kit]) verifyBuildConfig(len(checkedTargets), kit, config, True, True) - if virtualFunctionsAdded and platform.system() in ('Microsoft', 'Windows') and is480Kit: + if virtualFunctionsAdded and platform.system() in ('Microsoft', 'Windows') and is487Kit: test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.") continue invokeMenuItem('Build', 'Build Project "%s"' % projectName) @@ -126,12 +125,12 @@ def main(): addReturn(editor, "QObject \*%s::create.*" % className, "0") virtualFunctionsAdded = True invokeMenuItem('File', 'Save All') - if platform.system() in ('Microsoft', 'Windows') and is480Kit: # QTCREATORBUG-12251 + if platform.system() in ('Microsoft', 'Windows') and is487Kit: # QTCREATORBUG-12251 test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.") continue invokeMenuItem('Build', 'Rebuild Project "%s"' % projectName) waitForCompile(10000) - if platform.system() == "Darwin" and is480Kit: + if platform.system() == "Darwin" and is487Kit: test.log("Skipping compile check (gcc on OSX is only clang with gcc frontend nowadays)") continue checkCompile() |