From 8a0602873e4a224cdd3d835f3ab1b08dcc2ef246 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Tue, 16 Oct 2012 12:55:49 +0200
Subject: Doc fixes for qcoreapplication.

Change-Id: I58806424b37ebf7bdf9b7f1ead9953b605332361
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
---
 src/corelib/kernel/qcoreapplication.cpp | 28 +++++++++++++++++++++-------
 src/corelib/kernel/qcoreapplication.h   |  6 +++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 8ff4aa7c54..590d127094 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -577,8 +577,12 @@ void QCoreApplication::flush()
     \a argc must be greater than zero and \a argv must contain at least
     one valid character string.
 */
-QCoreApplication::QCoreApplication(int &argc, char **argv, int _internal)
-: QObject(*new QCoreApplicationPrivate(argc, argv, _internal))
+QCoreApplication::QCoreApplication(int &argc, char **argv
+#ifndef Q_QDOC
+                                   , int _internal
+#endif
+                                   )
+    : QObject(*new QCoreApplicationPrivate(argc, argv, _internal))
 {
     init();
     QCoreApplicationPrivate::eventDispatcher->startingUp();
@@ -698,7 +702,17 @@ bool QCoreApplication::testAttribute(Qt::ApplicationAttribute attribute)
     return QCoreApplicationPrivate::testAttribute(attribute);
 }
 
-/*!/
+
+/*!
+    \property QCoreApplication::quitLockEnabled
+
+    Returns true if the use of the QEventLoopLocker feature can cause the
+    application to quit, otherwise returns false.
+
+    \sa QEventLoopLocker
+*/
+
+/*!
     Returns true if the use of the QEventLoopLocker feature can cause the
     application to quit, otherwise returns false.
 
@@ -2220,7 +2234,7 @@ void QCoreApplication::installNativeEventFilter(QAbstractNativeEventFilter *filt
 }
 
 /*!
-    Removes an event filter object \a obj from this object. The
+    Removes an event \a filterObject from this object. The
     request is ignored if such an event filter has not been installed.
 
     All event filters for this object are automatically removed when
@@ -2232,12 +2246,12 @@ void QCoreApplication::installNativeEventFilter(QAbstractNativeEventFilter *filt
     \sa installNativeEventFilter()
     \since 5.0
 */
-void QCoreApplication::removeNativeEventFilter(QAbstractNativeEventFilter *filterObj)
+void QCoreApplication::removeNativeEventFilter(QAbstractNativeEventFilter *filterObject)
 {
     QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance();
-    if (!filterObj || !eventDispatcher)
+    if (!filterObject || !eventDispatcher)
         return;
-    eventDispatcher->removeNativeEventFilter(filterObj);
+    eventDispatcher->removeNativeEventFilter(filterObject);
 }
 
 /*!
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 46eab4e740..b65f0cd314 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -85,7 +85,11 @@ public:
         GuiServer // # deprecated
     };
 
-    QCoreApplication(int &argc, char **argv, int = ApplicationFlags);
+    QCoreApplication(int &argc, char **argv
+#ifndef Q_QDOC
+                     , int = ApplicationFlags
+#endif
+            );
 
     ~QCoreApplication();
 
-- 
cgit v1.2.3