diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2013-09-25 16:45:17 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2013-09-27 12:28:23 +0200 |
| commit | 95828d4691a993e552843738114507a5a30efe2a (patch) | |
| tree | 50b9d51300290e2071827261ef9373d4c9919ceb /tests/system/suite_WELP | |
| parent | b54ab83be9bc78f75315aea66f0dc29601d58338 (diff) | |
| download | qt-creator-95828d4691a993e552843738114507a5a30efe2a.tar.gz | |
Squish: Handle differences between Qt 4 and Qt 5
Change-Id: I529d5cbd017f7d17fbe2f38fc539583e96d835cf
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 | 3 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP02/test.py | 3 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP03/test.py | 3 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP04/test.py | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index 6e4aa1df8f..23151ce4ae 100755 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -55,6 +55,9 @@ def clickItemVerifyHelpCombo(qmlItem, expectedHelpComboRegex, testDetails): "Verifying: Getting Started topic is being displayed.") def main(): + if isQt4Build: + test.log("Welcome mode is only available if Creator was built on Qt 5") + return global webPageContentLoadedValue, gettingStartedText # open Qt Creator startApplication("qtcreator" + SettingsPath) diff --git a/tests/system/suite_WELP/tst_WELP02/test.py b/tests/system/suite_WELP/tst_WELP02/test.py index c63f2864db..58f0df9d29 100644 --- a/tests/system/suite_WELP/tst_WELP02/test.py +++ b/tests/system/suite_WELP/tst_WELP02/test.py @@ -31,6 +31,9 @@ source("../../shared/qtcreator.py") source("../../shared/suites_qtta.py") def main(): + if isQt4Build: + test.log("Welcome mode is only available if Creator was built on Qt 5") + return # prepare example project sourceExample = os.path.join(sdkPath, "Examples", "4.7", "declarative", "animation", "basics", "property-animation") diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index 61eb2018e1..58c5ca3462 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -60,6 +60,9 @@ def handlePackagingMessageBoxes(): break def main(): + if isQt4Build: + test.log("Welcome mode is only available if Creator was built on Qt 5") + return global sdkPath, webPageContentLoadedValue # open Qt Creator startApplication("qtcreator" + SettingsPath) diff --git a/tests/system/suite_WELP/tst_WELP04/test.py b/tests/system/suite_WELP/tst_WELP04/test.py index 3292c6db6b..f806dee7d1 100644 --- a/tests/system/suite_WELP/tst_WELP04/test.py +++ b/tests/system/suite_WELP/tst_WELP04/test.py @@ -31,6 +31,9 @@ source("../../shared/qtcreator.py") source("../../shared/suites_qtta.py") def main(): + if isQt4Build: + test.log("Welcome mode is only available if Creator was built on Qt 5") + return # open Qt Creator startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): |