diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2014-01-08 15:25:14 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2014-01-09 08:58:46 +0100 |
| commit | 49db5bfa52899d4e148ac73aa9f0adf886fcc293 (patch) | |
| tree | 8fd9b6f0262d53fba9421d4023d69d9632c33ba4 /tests | |
| parent | ca79e4294d47db960ce97abf30b9ef8598eba7bd (diff) | |
Squish: Add workaround for native file dialogs on Win
Current Squish fails to hook into native file dialogs for
Qt5 builds. The workaround forces Qt Creator to use QFileDialog.
Change-Id: I3a28314bab54178d93cda85c0a36e9202f037c9c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/shared/qtcreator.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 76e947c0261..290d622ce7a 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -60,15 +60,19 @@ source("../../shared/workarounds.py") # function must be called BEFORE any call except the first (which is done always automatically) def overrideStartApplication(): global startApplication, __origStartApplication__ - if (platform.system() != "Darwin"): + if (platform.system() == "Linux"): return if (__origStartApplication__ == None): __origStartApplication__ = startApplication def startApplication(*args): args = list(args) if str(args[0]).startswith('qtcreator'): - args[0] = args[0].replace('qtcreator', '"Qt Creator"', 1) - test.log("Using workaround for MacOS (different AUT name)") + if platform.system() == 'Darwin': + args[0] = args[0].replace('qtcreator', '"Qt Creator"', 1) + test.log("Using workaround for MacOS (different AUT name)") + elif not isQt4Build: + args[0] = args[0] + ' -platform windows:dialogs=none' + test.log("Using workaround for Windows (failing to hook into native FileDialog)") return __origStartApplication__(*args) def startedWithoutPluginError(): |