diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2014-10-30 15:57:44 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2014-10-31 14:52:03 +0100 |
| commit | 07a52d1ae65cac3a8566fef3cf214e756509adad (patch) | |
| tree | f6d027dc9a059a2deb75a0630bc4f8281596e203 /tests/system/suite_WELP | |
| parent | 2978f08bfa899dcf0bddf678d964c68f57e46751 (diff) | |
Squish: Remove Qt4 compatibility code
Thank you Qt4 for all the good times we had together.
Farewell.
Change-Id: If0e81b71a97524bb0c84ea5bbcba4c29244a0a5e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests/system/suite_WELP')
| -rwxr-xr-x | tests/system/suite_WELP/tst_WELP01/test.py | 4 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP02/test.py | 4 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP03/test.py | 4 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP04/test.py | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index 26ecfda543..5520439fe9 100755 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -58,8 +58,8 @@ def waitForButtonsState(projectsChecked, examplesChecked, tutorialsChecked, time 'and tutoButton.checked == tutorialsChecked', timeout) def main(): - if isQt4Build or not canTestEmbeddedQtQuick(): - test.log("Welcome mode is not available or not scriptable with this Squish version") + if not canTestEmbeddedQtQuick(): + test.log("Welcome mode is not scriptable with this Squish version") return global gettingStartedText # open Qt Creator diff --git a/tests/system/suite_WELP/tst_WELP02/test.py b/tests/system/suite_WELP/tst_WELP02/test.py index 3eeb8e5062..f2ef28686c 100644 --- a/tests/system/suite_WELP/tst_WELP02/test.py +++ b/tests/system/suite_WELP/tst_WELP02/test.py @@ -39,8 +39,8 @@ def checkTypeAndProperties(typePropertiesDetails): "Verifying: Qt Creator displays %s." % detail) def main(): - if isQt4Build or not canTestEmbeddedQtQuick(): - test.log("Welcome mode is not available or not scriptable with this Squish version") + if not canTestEmbeddedQtQuick(): + test.log("Welcome mode is not scriptable with this Squish version") return # prepare example project sourceExample = os.path.join(sdkPath, "Examples", "4.7", "declarative", "animation", "basics", diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index bdb76eb806..33819b105c 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -73,8 +73,8 @@ def handlePackagingMessageBoxes(): break def main(): - if isQt4Build or not canTestEmbeddedQtQuick(): - test.log("Welcome mode is not available or not scriptable with this Squish version") + if not canTestEmbeddedQtQuick(): + test.log("Welcome mode is not scriptable with this Squish version") return global sdkPath # open Qt Creator diff --git a/tests/system/suite_WELP/tst_WELP04/test.py b/tests/system/suite_WELP/tst_WELP04/test.py index 749a481572..206dace3ec 100644 --- a/tests/system/suite_WELP/tst_WELP04/test.py +++ b/tests/system/suite_WELP/tst_WELP04/test.py @@ -32,8 +32,8 @@ source("../../shared/qtcreator.py") source("../../shared/suites_qtta.py") def main(): - if isQt4Build or not canTestEmbeddedQtQuick(): - test.log("Welcome mode is not available or not scriptable with this Squish version") + if not canTestEmbeddedQtQuick(): + test.log("Welcome mode is not scriptable with this Squish version") return # open Qt Creator startApplication("qtcreator" + SettingsPath) |