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

Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628

1 files changed, 21 insertions, 16 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 8ae3057f3e..2e70d40bd2 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -485,6 +485,10 @@ void QCoreApplicationPrivate::createEventDispatcher()
 #endif
 }
 
+void QCoreApplicationPrivate::eventDispatcherReady()
+{
+}
+
 QThread *QCoreApplicationPrivate::theMainThread = 0;
 QThread *QCoreApplicationPrivate::mainThread()
 {
@@ -720,6 +724,7 @@ void QCoreApplication::init()
     }
 
     d->threadData->eventDispatcher = QCoreApplicationPrivate::eventDispatcher;
+    d->eventDispatcherReady();
 #endif
 
 #ifndef QT_NO_LIBRARY
@@ -811,8 +816,8 @@ void QCoreApplication::setAttribute(Qt::ApplicationAttribute attribute, bool on)
 }
 
 /*!
-  Returns true if attribute \a attribute is set;
-  otherwise returns false.
+  Returns \c true if attribute \a attribute is set;
+  otherwise returns \c false.
 
   \sa setAttribute()
  */
@@ -827,15 +832,15 @@ bool QCoreApplication::testAttribute(Qt::ApplicationAttribute attribute)
 /*!
     \property QCoreApplication::quitLockEnabled
 
-    Returns true if the use of the QEventLoopLocker feature can cause the
-    application to quit, otherwise returns false.
+    Returns \c true if the use of the QEventLoopLocker feature can cause the
+    application to quit, otherwise returns \c false.
 
     \sa QEventLoopLocker
 */
 
 /*!
-    Returns true if the use of the QEventLoopLocker feature can cause the
-    application to quit, otherwise returns false.
+    Returns \c true if the use of the QEventLoopLocker feature can cause the
+    application to quit, otherwise returns \c false.
 
     \sa QEventLoopLocker
  */
@@ -893,7 +898,7 @@ bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event)
   For certain types of events (e.g. mouse and key events),
   the event will be propagated to the receiver's parent and so on up to
   the top-level object if the receiver is not interested in the event
-  (i.e., it returns false).
+  (i.e., it returns \c false).
 
   There are five different ways that events can be processed;
   reimplementing this virtual function is just one of them. All five
@@ -1001,8 +1006,8 @@ bool QCoreApplicationPrivate::notify_helper(QObject *receiver, QEvent * event)
 }
 
 /*!
-  Returns true if an application object has not been created yet;
-  otherwise returns false.
+  Returns \c true if an application object has not been created yet;
+  otherwise returns \c false.
 
   \sa closingDown()
 */
@@ -1013,8 +1018,8 @@ bool QCoreApplication::startingUp()
 }
 
 /*!
-  Returns true if the application objects are being destroyed;
-  otherwise returns false.
+  Returns \c true if the application objects are being destroyed;
+  otherwise returns \c false.
 
   \sa startingUp()
 */
@@ -1284,7 +1289,7 @@ void QCoreApplication::postEvent(QObject *receiver, QEvent *event, int priority)
 
 /*!
   \internal
-  Returns true if \a event was compressed away (possibly deleted) and should not be added to the list.
+  Returns \c true if \a event was compressed away (possibly deleted) and should not be added to the list.
 */
 bool QCoreApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventList *postedEvents)
 {
@@ -1712,7 +1717,7 @@ void QCoreApplication::quit()
     generated by Qt Designer provide a \c retranslateUi() function that can be
     called.
 
-    The function returns true on success and false on failure.
+    The function returns \c true on success and false on failure.
 
     \sa removeTranslator(), translate(), QTranslator::load(), {Dynamic Translation}
 */
@@ -1745,7 +1750,7 @@ bool QCoreApplication::installTranslator(QTranslator *translationFile)
     translation files used by this application. (It does not delete the
     translation file from the file system.)
 
-    The function returns true on success and false on failure.
+    The function returns \c true on success and false on failure.
 
     \sa installTranslator(), translate(), QObject::tr()
 */
@@ -2479,8 +2484,8 @@ void QCoreApplication::removeNativeEventFilter(QAbstractNativeEventFilter *filte
 }
 
 /*!
-    This function returns true if there are pending events; otherwise
-    returns false. Pending events can be either from the window
+    This function returns \c true if there are pending events; otherwise
+    returns \c false. Pending events can be either from the window
     system or posted events using postEvent().
 
     \sa QAbstractEventDispatcher::hasPendingEvents()