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

Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
index 2af37eb86e..b511abf670 100644
--- a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
+++ b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
@@ -823,6 +823,24 @@ void tst_QTimeZone::tzTest()
     QCOMPARE(dat.offsetFromUtc, 3600);
     QCOMPARE(dat.standardTimeOffset, 3600);
     QCOMPARE(dat.daylightTimeOffset, 0);
+
+    // Test TZ timezone vs UTC timezone for fractionary negative offset
+    QTzTimeZonePrivate  tztz1("America/Caracas");
+    QUtcTimeZonePrivate tzutc1("UTC-04:30");
+    QVERIFY(tztz1.isValid());
+    QVERIFY(tzutc1.isValid());
+    QTzTimeZonePrivate::Data datatz1 = tztz1.data(std);
+    QTzTimeZonePrivate::Data datautc1 = tzutc1.data(std);
+    QCOMPARE(datatz1.offsetFromUtc, datautc1.offsetFromUtc);
+
+    // Test TZ timezone vs UTC timezone for fractionary positive offset
+    QTzTimeZonePrivate  tztz2("Asia/Calcutta");
+    QUtcTimeZonePrivate tzutc2("UTC+05:30");
+    QVERIFY(tztz2.isValid());
+    QVERIFY(tzutc2.isValid());
+    QTzTimeZonePrivate::Data datatz2 = tztz2.data(std);
+    QTzTimeZonePrivate::Data datautc2 = tzutc2.data(std);
+    QCOMPARE(datatz2.offsetFromUtc, datautc2.offsetFromUtc);
 #endif // Q_OS_UNIX
 }