12 files changed, 36 insertions, 16 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index df0ffce12d..8ff4aa7c54 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1003,7 +1003,7 @@ int QCoreApplication::exec()
     if (self) {
         self->d_func()->in_exec = false;
         if (!self->d_func()->aboutToQuitEmitted)
-            emit self->aboutToQuit();
+            emit self->aboutToQuit(QPrivateSignal());
         self->d_func()->aboutToQuitEmitted = true;
         sendPostedEvents(0, QEvent::DeferredDelete);
     }
@@ -1796,8 +1796,6 @@ QString QCoreApplication::applicationFilePath()
     if (!executables.empty()) {
         //We assume that there is only one executable in the folder
         return dir.absoluteFilePath(executables.first());
-    } else {
-        return QString();
     }
 #elif defined(Q_OS_MAC)
     QString qAppFileName_str = qAppFileName();
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 622139e6f8..46eab4e740 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -166,8 +166,16 @@ public Q_SLOTS:
     static void quit();
 
 Q_SIGNALS:
-    void aboutToQuit();
-    void unixSignal(int);
+    void aboutToQuit(
+#if !defined(qdoc)
+    QPrivateSignal
+#endif
+    );
+    void unixSignal(int
+#if !defined(qdoc)
+    , QPrivateSignal
+#endif
+    );
 
 protected:
     bool event(QEvent *);
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index ded1f27f4f..44715b0553 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -191,7 +191,7 @@ int QEventDispatcherUNIXPrivate::doSelect(QEventLoop::ProcessEventsFlags flags,
                 for (int i = 0; i < NSIG; ++i) {
                     if (signals_fired[i]) {
                         signals_fired[i] = 0;
-                        emit QCoreApplication::instance()->unixSignal(i);
+                        emit QCoreApplication::instance()->unixSignal(i, QCoreApplication::QPrivateSignal());
                     }
                 }
             }
diff --git a/src/corelib/kernel/qeventloop_p.h b/src/corelib/kernel/qeventloop_p.h
index f0eec41137..9594789944 100644
--- a/src/corelib/kernel/qeventloop_p.h
+++ b/src/corelib/kernel/qeventloop_p.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Core)
-
 class QEventLoopPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QEventLoop)
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 58e8fcb24d..268677ee1b 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -1004,7 +1004,7 @@ void QObject::setObjectName(const QString &name)
 
     if (d->extraData->objectName != name) {
         d->extraData->objectName = name;
-        emit objectNameChanged(d->extraData->objectName);
+        emit objectNameChanged(d->extraData->objectName, QPrivateSignal());
     }
 }
 
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 653cc6a42e..689946b6c4 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -348,7 +348,11 @@ public:
 
 Q_SIGNALS:
     void destroyed(QObject * = 0);
-    void objectNameChanged(const QString &objectName);
+    void objectNameChanged(const QString &objectName
+#if !defined(qdoc)
+    , QPrivateSignal
+#endif
+    );
 
 public:
     inline QObject *parent() const { return d_ptr->parent; }
diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp
index cf65ea895c..f1b8741242 100644
--- a/src/corelib/kernel/qsocketnotifier.cpp
+++ b/src/corelib/kernel/qsocketnotifier.cpp
@@ -298,7 +298,7 @@ bool QSocketNotifier::event(QEvent *e)
     }
     QObject::event(e);                        // will activate filters
     if ((e->type() == QEvent::SockAct) || (e->type() == QEvent::SockClose)) {
-        emit activated(d->sockfd);
+        emit activated(d->sockfd, QPrivateSignal());
         return true;
     }
     return false;
diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h
index 177ce224bd..35e73b790b 100644
--- a/src/corelib/kernel/qsocketnotifier.h
+++ b/src/corelib/kernel/qsocketnotifier.h
@@ -69,7 +69,11 @@ public Q_SLOTS:
     void setEnabled(bool);
 
 Q_SIGNALS:
-    void activated(int socket);
+    void activated(int socket
+#if !defined(qdoc)
+    , QPrivateSignal
+#endif
+    );
 
 protected:
     bool event(QEvent *);
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index a685973bd7..9dea666363 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -247,7 +247,7 @@ void QTimer::timerEvent(QTimerEvent *e)
     if (e->timerId() == id) {
         if (single)
             stop();
-        emit timeout();
+        emit timeout(QPrivateSignal());
     }
 }
 
diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h
index b934440275..a3cc1c7813 100644
--- a/src/corelib/kernel/qtimer.h
+++ b/src/corelib/kernel/qtimer.h
@@ -88,7 +88,11 @@ public Q_SLOTS:
     void stop();
 
 Q_SIGNALS:
-    void timeout();
+    void timeout(
+#if !defined(qdoc)
+      QPrivateSignal
+#endif
+    );
 
 protected:
     void timerEvent(QTimerEvent *);
diff --git a/src/corelib/kernel/qwineventnotifier.cpp b/src/corelib/kernel/qwineventnotifier.cpp
index 9a99b15202..44116c3333 100644
--- a/src/corelib/kernel/qwineventnotifier.cpp
+++ b/src/corelib/kernel/qwineventnotifier.cpp
@@ -234,7 +234,7 @@ bool QWinEventNotifier::event(QEvent * e)
     }
     QObject::event(e);                        // will activate filters
     if (e->type() == QEvent::WinEventAct) {
-        emit activated(d->handleToEvent);
+        emit activated(d->handleToEvent, QPrivateSignal());
         return true;
     }
     return false;
diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h
index add4059595..d5e4d0f7e3 100644
--- a/src/corelib/kernel/qwineventnotifier.h
+++ b/src/corelib/kernel/qwineventnotifier.h
@@ -74,7 +74,11 @@ public Q_SLOTS:
     void setEnabled(bool enable);
 
 Q_SIGNALS:
-    void activated(HANDLE hEvent);
+    void activated(HANDLE hEvent
+#if !defined(qdoc)
+    , QPrivateSignal
+#endif
+    );
 
 protected:
     bool event(QEvent * e);