15 files changed, 30 insertions, 18 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index a45c3cbc58..ab92171b7b 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -855,6 +855,7 @@
            \endlist
         \o \list
                \o MINGWM10.DLL - The MinGW run-time
+               \o LIBGCC_S_DW2-1.DLL
            \endlist
     \endtable
 
diff --git a/doc/src/development/debug.qdoc b/doc/src/development/debug.qdoc
index 3a29d23bd2..6de24a097f 100644
--- a/doc/src/development/debug.qdoc
+++ b/doc/src/development/debug.qdoc
@@ -85,7 +85,7 @@
     be excessively large. However, with the release of Xcode 2.3 it is
     now possible to use Dwarf symbols which take up a significantly
     smaller amount of space.  To enable this feature when configuring
-    Qt, pass the \c{-dwarf-2} option to the configure script.
+    Qt, pass the \c{-dwarf2} option to the configure script.
 
     This is not enabled by default because previous versions of Xcode
     will not work with the compiler flag used to implement this
diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc
index 12e292a9b4..ace3a5f5c5 100644
--- a/doc/src/development/designer-manual.qdoc
+++ b/doc/src/development/designer-manual.qdoc
@@ -1879,7 +1879,8 @@ pixmap property in the property editor.
     \snippet examples/designer/calculatorform/calculatorform.cpp 0
 
     We can connect signals and slots in user interface widgets in the usual
-    way, taking care to prefix the \c ui object to each widget used.
+    way by adding the on_<object name> - prefix. For more information,
+    see \l{widgets-and-dialogs-with-auto-connect}.
 
     The advantages of this approach are its simple use of inheritance to
     provide a QWidget-based interface, and its encapsulation of the user
diff --git a/doc/src/images/deployment-windows-depends.png b/doc/src/images/deployment-windows-depends.png
index 56c843932b..6d0b36f4f2 100644
--- a/doc/src/images/deployment-windows-depends.png
+++ b/doc/src/images/deployment-windows-depends.png
diff --git a/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp b/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp
index 21c077e427..0167e27bef 100644
--- a/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp
+++ b/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp
@@ -105,7 +105,7 @@ while (it.current()) {
 
 //! [7]
 QList<Q3ListViewItem *> lst;
-Q3ListViewItemIterator it(myListView, Selected);
+Q3ListViewItemIterator it(myListView, Q3ListViewItemIterator::Selected);
 while (it.current()) {
     lst.append(it.current());
     ++it;
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp
index 8f0f153b05..21e04ceb34 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp
@@ -1668,7 +1668,7 @@ IntPoint QWebPagePrivate::TouchAdjuster::findCandidatePointForTouch(const IntPoi
    changes the behaviour to a case sensitive find operation.
    \value FindWrapsAroundDocument Makes findText() restart from the beginning of the document if the end
    was reached and the text was not found.
-   \value HighlightAllOccurrences Highlights all existing occurrences of a specific string.
+   \value HighlightAllOccurrences Highlights all existing occurrences of a specific string. (This value was introduced in 4.6.)
 */
 
 /*!
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp
index 9123ede089..c1ef92e651 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp
@@ -434,11 +434,13 @@ QWebSettings* QWebSettings::globalSettings()
         web application cache feature is enabled or not. This is disabled by default.
     \value LocalStorageEnabled Specifies whether support for the HTML 5
         local storage feature is enabled or not. This is disabled by default.
+        (This value was introduced in 4.6.)
     \value LocalStorageDatabaseEnabled \e{This enum value is deprecated.} Use
         QWebSettings::LocalStorageEnabled instead.
     \value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are
         allowed to access remote urls. This is disabled by default. For more information
         about security origins and local vs. remote content see QWebSecurityOrigin.
+        (This value was introduced in 4.6.)
     \value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are
         allowed to access other local urls. This is enabled by default. For more information
         about security origins and local vs. remote content see QWebSecurityOrigin.
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 8e19c31c5b..9cfd253970 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -2345,7 +2345,7 @@ QStateMachine::SignalEvent::~SignalEvent()
 /*!
   \class QStateMachine::WrappedEvent
 
-  \brief The WrappedEvent class holds a clone of an event associated with a QObject.
+  \brief The WrappedEvent class inherits QEvent and holds a clone of an event associated with a QObject.
 
   \since 4.6
   \ingroup statemachine
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index d2b9f7bde3..4f90f8346f 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -388,7 +388,7 @@ int QDate::day() const
 }
 
 /*!
-    Returns the weekday (1 to 7) for this date.
+    Returns the weekday (1 = Monday to 7 = Sunday) for this date.
 
     \sa day(), dayOfYear(), Qt::DayOfWeek
 */
diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp
index 087252a926..94cc86384c 100644
--- a/src/corelib/tools/qelapsedtimer.cpp
+++ b/src/corelib/tools/qelapsedtimer.cpp
@@ -236,7 +236,7 @@ void QElapsedTimer::invalidate()
 }
 
 /*!
-    Returns true if this object was invalidated by a call to invalidate() and
+    Returns false if this object was invalidated by a call to invalidate() and
     has not been restarted since.
 
     \sa invalidate(), start(), restart()
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index aeb81f0d48..5801df3a7c 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -2037,6 +2037,8 @@ QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const
     The default is to follow whether the Qt::AA_DontUseNativeMenuBar attribute
     is set for the application. Explicitly settings this property overrides
     the presence (or abscence) of the attribute.
+
+    \sa void-qt-mac-set-native-menubar-bool-enable
 */
 
 void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
@@ -2145,6 +2147,8 @@ QAction *QMenuBar::defaultAction() const
     is triggered as a result of a mouse click; \a action is the action that
     caused the signal to be emitted.
 
+    \note QMenuBar has to have ownership of the QMenu in order this signal to work.
+
     Normally, you connect each menu action to a single slot using
     QAction::triggered(), but sometimes you will want to connect
     several items to a single slot (most often if the user selects
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index a81eb84d7c..7a7b455611 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -129,9 +129,9 @@
     \value NoProxy No proxying is used
     \value DefaultProxy Proxy is determined based on the application proxy set using setApplicationProxy()
     \value Socks5Proxy \l Socks5 proxying is used
-    \value HttpProxy HTTP transparent proxying is used
-    \value HttpCachingProxy Proxying for HTTP requests only
-    \value FtpCachingProxy Proxying for FTP requests only
+    \value HttpProxy HTTP transparent proxying is used (This value was introduced in 4.3.)
+    \value HttpCachingProxy Proxying for HTTP requests only (This value was introduced in 4.4.)
+    \value FtpCachingProxy Proxying for FTP requests only (This value was introduced in 4.4.)
 
     The table below lists different proxy types and their
     capabilities. Since each proxy type has different capabilities, it
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 411ac039d2..533ebd9a80 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -301,20 +301,23 @@
     \value ProxyAuthenticationRequiredError The socket is using a proxy, and
            the proxy requires authentication.
     \value SslHandshakeFailedError The SSL/TLS handshake failed, so
-           the connection was closed (only used in QSslSocket)
+           the connection was closed (only used in QSslSocket) (This value was introduced in 4.4.)
     \value UnfinishedSocketOperationError Used by QAbstractSocketEngine only,
            The last operation attempted has not finished yet (still in progress in
-            the background).
+            the background). (This value was introduced in 4.4.)
     \value ProxyConnectionRefusedError Could not contact the proxy server because
-           the connection to that server was denied
+           the connection to that server was denied (This value was introduced in 4.5.)
     \value ProxyConnectionClosedError The connection to the proxy server was closed
            unexpectedly (before the connection to the final peer was established)
+           (This value was introduced in 4.5.)
     \value ProxyConnectionTimeoutError The connection to the proxy server timed out
            or the proxy server stopped responding in the authentication phase.
+           (This value was introduced in 4.5.)
     \value ProxyNotFoundError The proxy address set with setProxy() (or the application
-           proxy) was not found.
+           proxy) was not found. (This value was introduced in 4.5.)
     \value ProxyProtocolError The connection negotiation with the proxy server
            because the response from the proxy server could not be understood.
+           (This value was introduced in 4.5.)
 
     \value UnknownSocketError An unidentified error occurred.
     \sa QAbstractSocket::error()
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 727588a08b..5b5369a7d5 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -196,8 +196,8 @@ QT_BEGIN_NAMESPACE
   "standard" Qt constructor, Qt Script can provide a default script
   constructor for you; see scriptValueFromQMetaObject().
 
-  See the \l{QtScript} documentation for more information on
-  the QObject integration.
+  For more information about QObject integration, see
+  \l{Making Applications Scriptable}
 
   \section1 Support for Custom C++ Types
 
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp
index c827323592..3b97755e8d 100644
--- a/src/sql/kernel/qsqlrecord.cpp
+++ b/src/sql/kernel/qsqlrecord.cpp
@@ -273,8 +273,9 @@ const QSqlField* QSqlRecord::fieldPtr(const QString& name) const
 #endif //QT3_SUPPORT
 
 /*!
-    Returns the field at position \a index. If the position is out of
-    range, an empty field is returned.
+    Returns the field at position \a index. If the \a index
+    is out of range, function returns
+    a \l{default-constructed value}.
  */
 QSqlField QSqlRecord::field(int index) const
 {