diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-23 14:16:56 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-31 18:42:23 +0100 |
| commit | 662c9c95bf47fde5613b6b3f0d86bae3bcd1eaf5 (patch) | |
| tree | 20818da8b87c5fb91f64bd7a2b4ba16969cca4b9 | |
| parent | 6bf837df41a8b4b01ab8af3c63c120afb5c7091b (diff) | |
Purge use of QDateTime's locale-dependent APIs
Qt 6 shall drop all locale-specificity from Q(Date|Time)+, including
support for the Qt::DateFormat enum's locale-specific members.
Remove a few uses of these from a remote objects example.
Task-number: QTBUG-80441
Change-Id: Ice17348cf68efe0f0d9634b78a72ff33384d81a0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| -rw-r--r-- | tests/auto/proxy_multiprocess/client/main.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/proxy_multiprocess/server/main.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/proxy_multiprocess/server/mytestserver.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/proxy_multiprocess/client/main.cpp b/tests/auto/proxy_multiprocess/client/main.cpp index f28c65a..89fe043 100644 --- a/tests/auto/proxy_multiprocess/client/main.cpp +++ b/tests/auto/proxy_multiprocess/client/main.cpp @@ -61,7 +61,7 @@ private Q_SLOTS: QVERIFY(m_rep->tracks() != nullptr); QVERIFY(tracksSpy.count() || tracksSpy.wait()); QCOMPARE(m_rep->myEnum(), ParentClassReplica::bar); - QCOMPARE(m_rep->date(), Qt::SystemLocaleShortDate); + QCOMPARE(m_rep->date(), Qt::RFC2822Date); QCOMPARE(m_rep->nsEnum(), NS::Bravo); QCOMPARE(m_rep->ns2Enum(), NS2::NamespaceEnum::Bravo); QCOMPARE(m_rep->variant(), QVariant::fromValue(42.0f)); @@ -100,7 +100,7 @@ private Q_SLOTS: QCOMPARE(m_rep->subClass()->i(), updatedI); QVERIFY(m_rep->tracks() != nullptr); QCOMPARE(m_rep->myEnum(), ParentClassReplica::foobar); - QCOMPARE(m_rep->date(), Qt::SystemLocaleLongDate); + QCOMPARE(m_rep->date(), Qt::ISODateWithMs); QCOMPARE(m_rep->nsEnum(), NS::Charlie); QCOMPARE(m_rep->ns2Enum(), NS2::NamespaceEnum::Charlie); QCOMPARE(m_rep->variant(), QVariant::fromValue(podValue)); diff --git a/tests/auto/proxy_multiprocess/server/main.cpp b/tests/auto/proxy_multiprocess/server/main.cpp index 1e8f107..04682bc 100644 --- a/tests/auto/proxy_multiprocess/server/main.cpp +++ b/tests/auto/proxy_multiprocess/server/main.cpp @@ -56,7 +56,7 @@ private Q_SLOTS: parent.setSubClass(&subclass); parent.setTracks(&model); parent.setMyEnum(ParentClassSource::bar); - parent.setDate(Qt::SystemLocaleShortDate); + parent.setDate(Qt::RFC2822Date); parent.setNsEnum(NS::Bravo); parent.setNs2Enum(NS2::NamespaceEnum::Bravo); parent.setVariant(QVariant::fromValue(42.0f)); @@ -85,7 +85,7 @@ private Q_SLOTS: if (objectMode == QLatin1String("NullPointer")) parent.setTracks(&model); parent.setMyEnum(ParentClassSource::foobar); - parent.setDate(Qt::SystemLocaleLongDate); + parent.setDate(Qt::ISODateWithMs); parent.setNsEnum(NS::Charlie); parent.setNs2Enum(NS2::NamespaceEnum::Charlie); parent.setVariant(QVariant::fromValue(podValue)); diff --git a/tests/auto/proxy_multiprocess/server/mytestserver.cpp b/tests/auto/proxy_multiprocess/server/mytestserver.cpp index e55739d..19302ce 100644 --- a/tests/auto/proxy_multiprocess/server/mytestserver.cpp +++ b/tests/auto/proxy_multiprocess/server/mytestserver.cpp @@ -63,5 +63,5 @@ ParentClassSource::MyEnum MyTestServer::enumSlot(QPoint p, MyEnum myEnum) Qt::DateFormat MyTestServer::dateSlot(Qt::DateFormat date) { Q_UNUSED(date) - return Qt::SystemLocaleDate; + return Qt::RFC2822Date; } |