diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-23 17:56:57 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-23 17:57:59 +0200 |
| commit | bb2e06f828c2169f6853a7e8fd29b138bb469fe3 (patch) | |
| tree | 79ec99f41ccce75bc8b8fa11a25365b502fe520e /tests/auto/quick | |
| parent | 2ba0e25a0c6fee7e2144f1fc8b577f73e1155e6d (diff) | |
| parent | a626e0e3ff1ab160855c7deee283d8eb004d47ce (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I6f913ebc7aed68d4b8c3f8666fd2389607b491b7
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qmltests/tst_qmltests.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp index 4f4f847be..1ef8be582 100644 --- a/tests/auto/quick/qmltests/tst_qmltests.cpp +++ b/tests/auto/quick/qmltests/tst_qmltests.cpp @@ -49,6 +49,9 @@ int main(int argc, char **argv) qputenv("QML2_IMPORT_PATH", QByteArray(TESTS_SOURCE_DIR "qmltests/mock-delegates")); QScopedPointer<Application> app; + // Force to use English language for testing due to error message checks + QLocale::setDefault(QLocale("en")); + if (!QCoreApplication::instance()) app.reset(new Application(argc, argv)); QtWebEngine::initialize(); |