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

 Conflicts:
	src/widgets/styles/qstyle_p.h

Change-Id: I0e6e856bd6628da1135b3ba674dddffabbeb5c09

3 files changed, 7 insertions, 10 deletions

diff --git a/src/corelib/kernel/qelapsedtimer_win.cpp b/src/corelib/kernel/qelapsedtimer_win.cpp
index d8a50a8277..8becb17461 100644
--- a/src/corelib/kernel/qelapsedtimer_win.cpp
+++ b/src/corelib/kernel/qelapsedtimer_win.cpp
@@ -77,15 +77,6 @@ static inline qint64 ticksToNanoseconds(qint64 ticks)
     return ticks * 1000000;
 }
 
-static inline qint64 nanosecondsToTicks(qint64 nsec)
-{
-    if (counterFrequency > 0) {
-        // QueryPerformanceCounter uses an arbitrary frequency
-        return double(nsec) * counterFrequency / 1000000000.;
-    }
-    // GetTickCount(64) uses milliseconds
-    return nsec / 1000000;
-}
 
 static quint64 getTickCount()
 {
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 3bcad8cf32..56217262f2 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -235,6 +235,12 @@ QObject *QMetaObject::newInstance(QGenericArgument val0,
                                   QGenericArgument val8,
                                   QGenericArgument val9) const
 {
+    if (!inherits(&QObject::staticMetaObject))
+    {
+        qWarning("QMetaObject::newInstance: type %s does not inherit QObject", className());
+        return nullptr;
+    }
+
     QByteArray constructorName = className();
     {
         int idx = constructorName.lastIndexOf(':');
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index a2111a084f..dc0ab9f08a 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -817,7 +817,7 @@ bool QTranslatorPrivate::do_load(const uchar *data, qsizetype len, const QString
     data += MagicLength;
 
     QStringList dependencies;
-    while (data < end - 4) {
+    while (data < end - 5) {
         quint8 tag = read8(data++);
         quint32 blockLen = read32(data);
         data += 4;