5 files changed, 15 insertions, 23 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 06fbfb0d39..45b2293112 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -202,6 +202,7 @@ QT_BEGIN_NAMESPACE
     \value OkRequest                        Ok button in decoration pressed. Supported only for Windows CE.
     \value TabletEnterProximity             Wacom tablet enter proximity event (QTabletEvent), sent to QApplication.
     \value TabletLeaveProximity             Wacom tablet leave proximity event (QTabletEvent), sent to QApplication.
+    \value ThreadChange                     The object is moved to another thread. This is the last event sent to this object in the previous thread. See QObject::moveToThread().
     \value Timer                            Regular timer events (QTimerEvent).
     \value ToolBarChange                    The toolbar button is toggled on Mac OS X.
     \value ToolTip                          A tooltip was requested (QHelpEvent).
@@ -264,7 +265,6 @@ QT_BEGIN_NAMESPACE
     \omitvalue ShowWindowRequest
     \omitvalue Speech
     \omitvalue Style
-    \omitvalue ThreadChange
     \omitvalue ZeroTimerEvent
     \omitvalue ApplicationActivated
     \omitvalue ApplicationDeactivated
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 833755f244..fb3e4e396b 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -3949,8 +3949,8 @@ void qDeleteInEventHandler(QObject *o)
 }
 
 /*!
-    \fn QMetaObject::Connection QObject::connect(const QObject *sender, (T::*signal)(...), const QObject *receiver, (T::*method)(...), Qt::ConnectionType type)
-
+    \fn QMetaObject::Connection QObject::connect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType type)
+    \overload connect()
     \threadsafe
 
     Creates a connection of the given \a type from the \a signal in
@@ -4006,18 +4006,14 @@ void qDeleteInEventHandler(QObject *o)
     \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 25
 
     make sure to declare the argument type with Q_DECLARE_METATYPE
-
-    A signal is emitted for every connection you make;
-    two signals are emitted for duplicate connections.
-    This overload does not support the type Qt::UniqueConnection
  */
 
 
 /*!
-    \fn QMetaObject::Connection QObject::connect(const QObject *sender, (T::*signal)(...), Functor functor)
+    \fn QMetaObject::Connection QObject::connect(const QObject *sender, PointerToMemberFunction signal, Functor functor)
 
     \threadsafe
-    \overload
+    \overload connect()
 
     Creates a connection of the given \a type from the \a signal in
     the \a sender object to the \a functor and returns a handle to the connection
@@ -4166,9 +4162,9 @@ bool QObject::disconnect(const QMetaObject::Connection &connection)
     return true;
 }
 
-/*! \fn bool QObject::disconnect(const QObject *sender, (T::*signal)(...), const Qbject *receiver, (T::*method)(...))
+/*! \fn bool QObject::disconnect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method)
+    \overload diconnect()
     \threadsafe
-    \overload
 
     Disconnects \a signal in object \a sender from \a method in object
     \a receiver. Returns true if the connection is successfully broken;
@@ -4225,6 +4221,7 @@ bool QObject::disconnect(const QMetaObject::Connection &connection)
 
     \sa connect()
 */
+
 bool QObject::disconnectImpl(const QObject *sender, void **signal, const QObject *receiver, void **slot, const QMetaObject *senderMetaObject)
 {
     if (sender == 0 || (receiver == 0 && slot != 0)) {
@@ -4286,7 +4283,7 @@ QMetaObject::Connection::~Connection()
 }
 
 /*!
-    \fn bool QMetaObject::Connection::operator bool()
+    \fn QMetaObject::Connection::operator bool() const
 
     Returns true if the connection is valid.
 
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index bbb583ed82..11b1a19e0b 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -221,8 +221,8 @@ public:
                         const char *member, Qt::ConnectionType type = Qt::AutoConnection) const;
 
 #ifdef Q_QDOC
-    QMetaObject::Connection QObject::connect(const QObject *sender, (T::*signal)(...), const QObject *receiver, (T::*method)(...), Qt::ConnectionType type)
-    QMetaObject::Connection QObject::connect(const QObject *sender, (T::*signal)(...), Functor functor)
+    static QMetaObject::Connection connect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType type);
+    static QMetaObject::Connection connect(const QObject *sender, PointerToMemberFunction signal, Functor functor);
 #else
     //Connect a signal to a pointer to qobject member function
     template <typename Func1, typename Func2>
@@ -301,7 +301,7 @@ public:
     static bool disconnect(const QMetaObject::Connection &);
 
 #ifdef Q_QDOC
-    bool QObject::disconnect(const QObject *sender, (T::*signal)(...), const Qbject *receiver, (T::*method)(...))
+    static bool disconnect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method);
 #else
     template <typename Func1, typename Func2>
     static inline bool disconnect(const typename QtPrivate::FunctionPointer<Func1>::Object *sender, Func1 signal,
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index 5ad070d3b1..9bcb8b9211 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -465,7 +465,7 @@ public:
     Connection();
     Connection(const Connection &other);
     Connection &operator=(const Connection &other);
-#ifdef qdoc
+#ifdef Q_QDOC
     operator bool() const;
 #else
     typedef void *Connection::*RestrictedBool;
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp
index 2b07fa99cc..1624bfef5c 100644
--- a/src/corelib/kernel/qtcore_eval.cpp
+++ b/src/corelib/kernel/qtcore_eval.cpp
@@ -555,13 +555,8 @@ void qt_eval_init_widget(QWidget *w)
 {
     if (qt_eval_days_left() == -2)
         return;
-    if (w->isTopLevel()) {
-        QString windowTitle = w->windowTitle();
-        if (windowTitle.isEmpty()) {
-            w->setWindowTitle(QLatin1String(" "));
-        } else if (!windowTitle.startsWith(qt_eval_title_prefix())) {
-            qt_eval_adapt_window_title(windowTitle);
-        }
+    if (w->isTopLevel() && w->windowTitle().isEmpty() && w->windowType() != Qt::Desktop ) {
+        w->setWindowTitle(QLatin1String(" "));
     }
 }
 #endif