From e13d3e9a4f9dfa0ecc4de8e4d0c81c82ecb6826d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Wed, 26 Jan 2022 11:01:54 +0200 Subject: 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. Change-Id: Ie6c318023bdf508d9f2067ca3fa9d77b78292be5 Reviewed-by: Edward Welbourne (cherry picked from commit 9c63dfd249aeeacc5c1573b6cfe4176fb9480f25) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/qml/qqmllocale/tst_qqmllocale.cpp | 4 ++-- 1 file 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); -- cgit v1.2.3