diff options
author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-01-26 11:01:54 +0200 |
---|---|---|
committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-01-31 16:57:19 +0000 |
commit | 9c63dfd249aeeacc5c1573b6cfe4176fb9480f25 (patch) | |
tree | e8c2cac760166569196a7cec3a2456352d5f33fa /tests/auto/qml/qqmllocale | |
parent | 0ad51325c7432c8a8da38580d26721455252e64f (diff) |
QNX: suppress QEXPECT_FAIL() on two tests it passes
As QNX's support for feature timezone uses the TZ backend,
V4's Date.timeZoneUpdated() works, as on Linux, so tests for
this method now pass.
Pick-to: 6.2 6.3
Change-Id: Ie6c318023bdf508d9f2067ca3fa9d77b78292be5
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmllocale')
-rw-r--r-- | tests/auto/qml/qqmllocale/tst_qqmllocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp index a318dc9ee7..7ef0275394 100644 --- a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp +++ b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp @@ -1437,7 +1437,7 @@ void tst_qqmllocale::timeZoneUpdated() obj.reset(c.create()); QVERIFY(obj); -#if !defined(Q_OS_LINUX) || defined(Q_OS_ANDROID) +#if (!defined(Q_OS_LINUX) && !defined(Q_OS_QNX)) || defined(Q_OS_ANDROID) QEXPECT_FAIL("", "Date.timeZoneUpdated() only works on non-Android Linux with QT_CONFIG(timezone).", Continue); @@ -1449,7 +1449,7 @@ void tst_qqmllocale::timeZoneUpdated() QMetaObject::invokeMethod(obj.data(), "check"); -#if !defined(Q_OS_LINUX) || defined(Q_OS_ANDROID) +#if (!defined(Q_OS_LINUX) && !defined(Q_OS_QNX)) || defined(Q_OS_ANDROID) QEXPECT_FAIL("", "Date.timeZoneUpdated() only works on non-Android Linux with QT_CONFIG(timezone).", Continue); |