Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 9 insertions, 6 deletions

diff --git a/doc/src/dnd.qdoc b/doc/src/dnd.qdoc
index 8d3d79d..5ede20c 100644
--- a/doc/src/dnd.qdoc
+++ b/doc/src/dnd.qdoc
@@ -141,15 +141,17 @@
     types of data that the widget accepts.
     You must reimplement this function if you want to receive either
     QDragMoveEvent or QDropEvent in your reimplementations of
-    \l{QWidget::dragMoveEvent()}{dragMoveEvent()} and dropEvent().
+    \l{QWidget::dragMoveEvent()}{dragMoveEvent()} and
+    \l{QWidget::dropEvent()}{dropEvent()}.
 
-    The following code shows how dragEnterEvent() can be reimplemented to
+    The following code shows how \l{QWidget::dragEnterEvent()}{dragEnterEvent()}
+    can be reimplemented to
     tell the drag and drop system that we can only handle plain text:
 
     \snippet doc/src/snippets/dropevents/window.cpp 3
 
-    The dropEvent() is used to unpack dropped data and handle it in way that
-    is suitable for your application.
+    The \l{QWidget::dropEvent()}{dropEvent()} is used to unpack dropped data
+    and handle it in way that is suitable for your application.
 
     In the following code, the text supplied in the event is passed to a
     QTextBrowser and a QComboBox is filled with the list of MIME types that
@@ -159,7 +161,8 @@
 
     In this case, we accept the proposed action without checking what it is.
     In a real world application, it may be necessary to return from the
-    dropEvent() function without accepting the proposed action or handling
+    \l{QWidget::dropEvent()}{dropEvent()} function without accepting the
+    proposed action or handling
     the data if the action is not relevant. For example, we may choose to
     ignore Qt::LinkAction actions if we do not support
     links to external sources in our application.
@@ -435,7 +438,7 @@
     \title Porting to Qt 4 - Drag and Drop
     \contentspage {Porting Guides}{Contents}
     \previouspage Porting to Qt 4 - Virtual Functions
-    \nextpage Porting .ui Files to Qt 4
+    \nextpage Porting UI Files to Qt 4
     \ingroup porting
     \brief An overview of the porting process for applications that use drag and drop.