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

Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2

1 files changed, 3 insertions, 2 deletions

diff --git a/src/corelib/tools/qtimezoneprivate.cpp b/src/corelib/tools/qtimezoneprivate.cpp
index 763d12b702..56da197542 100644
--- a/src/corelib/tools/qtimezoneprivate.cpp
+++ b/src/corelib/tools/qtimezoneprivate.cpp
@@ -656,10 +656,11 @@ QTimeZonePrivate *QUtcTimeZonePrivate::clone()
 
 QTimeZonePrivate::Data QUtcTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const
 {
-    Data d = invalidData();
+    Data d;
     d.abbreviation = m_abbreviation;
     d.atMSecsSinceEpoch = forMSecsSinceEpoch;
-    d.offsetFromUtc = m_offsetFromUtc;
+    d.standardTimeOffset = d.offsetFromUtc = m_offsetFromUtc;
+    d.daylightTimeOffset = 0;
     return d;
 }