2 files changed, 12 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index cf3ae1b7c5..80e42336d6 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1506,8 +1506,14 @@ void QCoreApplicationPrivate::ref()
 
 void QCoreApplicationPrivate::deref()
 {
-    if (!quitLockRef.deref() && in_exec && quitLockRefEnabled)
-        QCoreApplication::postEvent(qApp, new QEvent(QEvent::Quit));
+    if (!quitLockRef.deref())
+        maybeQuit();
+}
+
+void QCoreApplicationPrivate::maybeQuit()
+{
+    if (quitLockRef.load() == 0 && in_exec && quitLockRefEnabled && shouldQuit())
+        QCoreApplication::postEvent(QCoreApplication::instance(), new QEvent(QEvent::Quit));
 }
 
 /*!
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index 861a046f16..112b313129 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -92,6 +92,10 @@ public:
     QAtomicInt quitLockRef;
     void ref();
     void deref();
+    virtual bool shouldQuit() {
+      return true;
+    }
+    void maybeQuit();
 
     static QThread *theMainThread;
     static QThread *mainThread();