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

Change-Id: If7e51514ed6832750e3ad967e4d322ccf920d2bb

4 files changed, 42 insertions, 38 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 7816edd3f9..a3d00faf31 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -639,7 +639,6 @@ void QEventDispatcherWin32::createInternalHwnd()
 {
     Q_D(QEventDispatcherWin32);
 
-    Q_ASSERT(!d->internalHwnd);
     if (d->internalHwnd)
         return;
     d->internalHwnd = qt_create_internal_window(this);
@@ -664,9 +663,6 @@ void QEventDispatcherWin32::createInternalHwnd()
     // start all normal timers
     for (int i = 0; i < d->timerVec.count(); ++i)
         d->registerTimer(d->timerVec.at(i));
-
-    // trigger a call to sendPostedEvents()
-    wakeUp();
 }
 
 QEventDispatcherWin32::QEventDispatcherWin32(QObject *parent)
@@ -686,8 +682,10 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
 {
     Q_D(QEventDispatcherWin32);
 
-    if (!d->internalHwnd)
+    if (!d->internalHwnd) {
         createInternalHwnd();
+        wakeUp(); // trigger a call to sendPostedEvents()
+    }
 
     d->interrupt = false;
     emit awake();
diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h
index f9bb06a5c5..369c276615 100644
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -65,8 +65,8 @@ class Q_CORE_EXPORT QEventDispatcherWin32 : public QAbstractEventDispatcher
     Q_OBJECT
     Q_DECLARE_PRIVATE(QEventDispatcherWin32)
 
+protected:
     void createInternalHwnd();
-    friend class QGuiEventDispatcherWin32;
 
 public:
     explicit QEventDispatcherWin32(QObject *parent = 0);
diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp
index 173127b063..452e3464d6 100644
--- a/src/corelib/kernel/qjni.cpp
+++ b/src/corelib/kernel/qjni.cpp
@@ -80,38 +80,22 @@ static QString toDotEncodedClassName(const char *className)
     return QString::fromLatin1(className).replace(QLatin1Char('/'), QLatin1Char('.'));
 }
 
-static jclass getCachedClass(const QString &classDotEnc)
+static jclass getCachedClass(const QString &classDotEnc, bool *isCached = 0)
 {
     QHash<QString, jclass>::iterator it = cachedClasses->find(classDotEnc);
+    const bool found = (it != cachedClasses->end());
 
-    if (it == cachedClasses->end())
-        return 0;
-
-    return it.value();
-}
-
-static jclass findClass(const char *className, JNIEnv *env)
-{
-    const QString &classDotEnc = toDotEncodedClassName(className);
-    jclass clazz = getCachedClass(classDotEnc);
-    if (clazz != 0)
-        return clazz;
-
-    jclass fclazz = env->FindClass(className);
-    if (!exceptionCheckAndClear(env)) {
-        clazz = static_cast<jclass>(env->NewGlobalRef(fclazz));
-        env->DeleteLocalRef(fclazz);
-    }
+    if (isCached != 0)
+        *isCached = found;
 
-    cachedClasses->insert(classDotEnc, clazz);
-    return clazz;
+    return found ? it.value() : 0;
 }
 
-static jclass loadClass(const char *className, JNIEnv *env)
+static jclass loadClassDotEnc(const QString &classDotEnc, JNIEnv *env)
 {
-    const QString &classDotEnc = toDotEncodedClassName(className);
-    jclass clazz = getCachedClass(classDotEnc);
-    if (clazz != 0)
+    bool isCached = false;
+    jclass clazz = getCachedClass(classDotEnc, &isCached);
+    if (clazz != 0 || isCached)
         return clazz;
 
     QJNIObjectPrivate classLoader = QtAndroidPrivate::classLoader();
@@ -130,6 +114,11 @@ static jclass loadClass(const char *className, JNIEnv *env)
     return clazz;
 }
 
+inline static jclass loadClass(const char *className, JNIEnv *env)
+{
+    return loadClassDotEnc(toDotEncodedClassName(className), env);
+}
+
 typedef QHash<QString, jmethodID> JMethodIDHash;
 Q_GLOBAL_STATIC(JMethodIDHash, cachedMethodID)
 
@@ -224,12 +213,28 @@ JNIEnv *QJNIEnvironmentPrivate::operator->()
 
 jclass QJNIEnvironmentPrivate::findClass(const char *className, JNIEnv *env)
 {
-    jclass clazz = 0;
-    if (env != 0)
-        clazz = ::findClass(className, env);
+    const QString &classDotEnc = toDotEncodedClassName(className);
+    bool isCached = false;
+    jclass clazz = getCachedClass(classDotEnc, &isCached);
+
+    const bool found = (clazz != 0) || (clazz == 0 && isCached);
+
+    if (found)
+        return clazz;
+
+    if (env != 0) { // We got an env. pointer (We expect this to be the right env. and call FindClass())
+        jclass fclazz = env->FindClass(className);
+        if (!exceptionCheckAndClear(env)) {
+            clazz = static_cast<jclass>(env->NewGlobalRef(fclazz));
+            env->DeleteLocalRef(fclazz);
+        }
+
+        if (clazz != 0)
+            cachedClasses->insert(classDotEnc, clazz);
+    }
 
-    if (clazz == 0)
-        clazz = loadClass(className, QJNIEnvironmentPrivate());
+    if (clazz == 0) // We didn't get an env. pointer or we got one with the WRONG class loader...
+        clazz = loadClassDotEnc(classDotEnc, QJNIEnvironmentPrivate());
 
     return clazz;
 }
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp
index c0f8897b3b..eb1019534c 100644
--- a/src/corelib/kernel/qtcore_eval.cpp
+++ b/src/corelib/kernel/qtcore_eval.cpp
@@ -111,10 +111,11 @@ static EvaluationStatus qt_eval_is_supported()
 
 static int qt_eval_days_left()
 {
-    const char *expiry_date = const_cast<const char*>(qt_eval_expiry_date + 12);
+    const volatile char *const expiry_date = qt_eval_expiry_date + 12;
 
     QDate today = QDate::currentDate();
-    QDate lastday = QDate::fromString(QString::fromLatin1(expiry_date), Qt::ISODate);
+    QDate lastday = QDate::fromString(
+                QString::fromLatin1(const_cast<const char*>(expiry_date)), Qt::ISODate);
     return today.daysTo(lastday);
 }