6 files changed, 71 insertions, 3 deletions

diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index b2b22ad99c..0a68de8871 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -150,7 +150,7 @@ QT_BEGIN_NAMESPACE
     \value HoverLeave                       The mouse cursor leaves a hover widget (QHoverEvent).
     \value HoverMove                        The mouse cursor moves inside a hover widget (QHoverEvent).
     \value IconDrag                         The main icon of a window has been dragged away (QIconDragEvent).
-    \value IconTextChange                   Widget's icon text has been changed.
+    \value IconTextChange                   Widget's icon text has been changed. (Deprecated)
     \value InputMethod                      An input method is being used (QInputMethodEvent).
     \value InputMethodQuery                 A input method query event (QInputMethodQueryEvent)
     \value KeyboardLayoutChange             The keyboard layout has changed.
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index c208eb1180..53da4a849b 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -133,7 +133,7 @@ public:
         EnabledChange = 98,                     // enabled state has changed
         ActivationChange = 99,                  // window activation has changed
         StyleChange = 100,                      // style has changed
-        IconTextChange = 101,                   // icon text has changed
+        IconTextChange = 101,                   // icon text has changed.  Deprecated.
         ModifiedChange = 102,                   // modified state has changed
         MouseTrackingChange = 109,              // mouse tracking state has changed
 
diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp
index 22c0f03afc..097f641d19 100644
--- a/src/corelib/kernel/qjni.cpp
+++ b/src/corelib/kernel/qjni.cpp
@@ -204,6 +204,15 @@ static jfieldID getCachedFieldID(JNIEnv *env,
     }
 }
 
+void QJNILocalRefDeleter::cleanup(jobject obj)
+{
+    if (obj == 0)
+        return;
+
+    QJNIEnvironmentPrivate env;
+    env->DeleteLocalRef(obj);
+}
+
 class QJNIEnvironmentPrivateTLS
 {
 public:
@@ -2259,4 +2268,3 @@ bool QJNIObjectPrivate::isSameObject(const QJNIObjectPrivate &other) const
 }
 
 QT_END_NAMESPACE
-
diff --git a/src/corelib/kernel/qjni_p.h b/src/corelib/kernel/qjni_p.h
index e79caed5b8..ae9c7c3a7e 100644
--- a/src/corelib/kernel/qjni_p.h
+++ b/src/corelib/kernel/qjni_p.h
@@ -51,6 +51,14 @@
 
 QT_BEGIN_NAMESPACE
 
+struct Q_CORE_EXPORT QJNILocalRefDeleter
+{
+    static void cleanup(jobject obj);
+};
+
+// To simplify this we only define it for jobjects.
+typedef QScopedPointer<_jobject, QJNILocalRefDeleter> QJNIScopedLocalRef;
+
 class Q_CORE_EXPORT QJNIEnvironmentPrivate
 {
 public:
diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp
index dad2d5dc1e..f77fc4220c 100644
--- a/src/corelib/kernel/qjnihelpers.cpp
+++ b/src/corelib/kernel/qjnihelpers.cpp
@@ -122,6 +122,45 @@ void QtAndroidPrivate::handleNewIntent(JNIEnv *env, jobject intent)
     }
 }
 
+namespace {
+    class ResumePauseListeners
+    {
+    public:
+        QMutex mutex;
+        QList<QtAndroidPrivate::ResumePauseListener *> listeners;
+    };
+}
+
+Q_GLOBAL_STATIC(ResumePauseListeners, g_resumePauseListeners)
+
+void QtAndroidPrivate::registerResumePauseListener(ResumePauseListener *listener)
+{
+    QMutexLocker locker(&g_resumePauseListeners()->mutex);
+    g_resumePauseListeners()->listeners.append(listener);
+}
+
+void QtAndroidPrivate::unregisterResumePauseListener(ResumePauseListener *listener)
+{
+    QMutexLocker locker(&g_resumePauseListeners()->mutex);
+    g_resumePauseListeners()->listeners.removeAll(listener);
+}
+
+void QtAndroidPrivate::handlePause()
+{
+    QMutexLocker locker(&g_resumePauseListeners()->mutex);
+    const QList<QtAndroidPrivate::ResumePauseListener *> &listeners = g_resumePauseListeners()->listeners;
+    for (int i=0; i<listeners.size(); ++i)
+        listeners.at(i)->handlePause();
+}
+
+void QtAndroidPrivate::handleResume()
+{
+    QMutexLocker locker(&g_resumePauseListeners()->mutex);
+    const QList<QtAndroidPrivate::ResumePauseListener *> &listeners = g_resumePauseListeners()->listeners;
+    for (int i=0; i<listeners.size(); ++i)
+        listeners.at(i)->handleResume();
+}
+
 static inline bool exceptionCheck(JNIEnv *env)
 {
     if (env->ExceptionCheck()) {
diff --git a/src/corelib/kernel/qjnihelpers_p.h b/src/corelib/kernel/qjnihelpers_p.h
index 3ed8338b18..883b08ef60 100644
--- a/src/corelib/kernel/qjnihelpers_p.h
+++ b/src/corelib/kernel/qjnihelpers_p.h
@@ -68,6 +68,14 @@ namespace QtAndroidPrivate
         virtual bool handleNewIntent(JNIEnv *env, jobject intent) = 0;
     };
 
+    class Q_CORE_EXPORT ResumePauseListener
+    {
+    public:
+        virtual ~ResumePauseListener() {}
+        virtual void handlePause() {};
+        virtual void handleResume() {};
+    };
+
     Q_CORE_EXPORT jobject activity();
     Q_CORE_EXPORT JavaVM *javaVM();
     Q_CORE_EXPORT jint initJNI(JavaVM *vm, JNIEnv *env);
@@ -82,6 +90,11 @@ namespace QtAndroidPrivate
     Q_CORE_EXPORT void handleNewIntent(JNIEnv *env, jobject intent);
     Q_CORE_EXPORT void registerNewIntentListener(NewIntentListener *listener);
     Q_CORE_EXPORT void unregisterNewIntentListener(NewIntentListener *listener);
+
+    Q_CORE_EXPORT void handlePause();
+    Q_CORE_EXPORT void handleResume();
+    Q_CORE_EXPORT void registerResumePauseListener(ResumePauseListener *listener);
+    Q_CORE_EXPORT void unregisterResumePauseListener(ResumePauseListener *listener);
 }
 
 QT_END_NAMESPACE