Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/windows/qwindowscontext.cpp
	src/plugins/platforms/windows/windows.pri
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f

1 files changed, 15 insertions, 1 deletions

diff --git a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
index 2cebe1fb6f..714eb8a22a 100644
--- a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
+++ b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
@@ -299,7 +299,7 @@ void tst_QTimeZone::nullTest()
 
 void tst_QTimeZone::dataStreamTest()
 {
-    // Test the OffsetFromUtc backend serialization
+    // Test the OffsetFromUtc backend serialization. First with a custom timezone:
     QTimeZone tz1("QST", 123456, "Qt Standard Time", "QST", QLocale::Norway, "Qt Testing");
     QByteArray tmp;
     {
@@ -321,6 +321,20 @@ void tst_QTimeZone::dataStreamTest()
              QString("Qt Standard Time"));
     QCOMPARE(tz2.offsetFromUtc(QDateTime::currentDateTime()), 123456);
 
+    // And then with a standard IANA timezone (QTBUG-60595):
+    tz1 = QTimeZone("UTC");
+    QCOMPARE(tz1.isValid(), true);
+    {
+        QDataStream ds(&tmp, QIODevice::WriteOnly);
+        ds << tz1;
+    }
+    {
+        QDataStream ds(&tmp, QIODevice::ReadOnly);
+        ds >> tz2;
+    }
+    QCOMPARE(tz2.isValid(), true);
+    QCOMPARE(tz2.id(), tz1.id());
+
     // Test the system backend serialization
     tz1 = QTimeZone("Pacific/Auckland");