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

Conflicts:
	qmake/library/qmakeevaluator.cpp
	(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
	src/corelib/kernel/qcore_mac_objc.mm
	src/gui/painting/qcolor.h
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31

1 files changed, 7 insertions, 4 deletions

diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime_mac.mm b/tests/auto/corelib/tools/qdatetime/tst_qdatetime_mac.mm
index fb49b8952e..f73c7b9d5d 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime_mac.mm
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime_mac.mm
@@ -36,8 +36,11 @@
 void tst_QDateTime_macTypes()
 {
     // QDateTime <-> CFDate
-    {
-        QDateTime qtDateTime = QDateTime::fromMSecsSinceEpoch(0);
+
+    static const int kMsPerSecond = 1000;
+
+    for (int i = 0; i < kMsPerSecond; ++i) {
+        QDateTime qtDateTime = QDateTime::fromMSecsSinceEpoch(i);
         const CFDateRef cfDate = qtDateTime.toCFDate();
         QCOMPARE(QDateTime::fromCFDate(cfDate), qtDateTime);
         CFRelease(cfDate);
@@ -50,9 +53,9 @@ void tst_QDateTime_macTypes()
         QCOMPARE(QDateTime::fromCFDate(cfDate), qtDateTimeCopy);
     }
     // QDateTime <-> NSDate
-    {
+    for (int i = 0; i < kMsPerSecond; ++i) {
         QMacAutoReleasePool pool;
-        QDateTime qtDateTime = QDateTime::fromMSecsSinceEpoch(0);
+        QDateTime qtDateTime = QDateTime::fromMSecsSinceEpoch(i);
         const NSDate *nsDate = qtDateTime.toNSDate();
         QCOMPARE(QDateTime::fromNSDate(nsDate), qtDateTime);
     }