Merge commit 'qt/master'

Conflicts:
	doc/src/examples.qdoc
	doc/src/plugins-howto.qdoc
	doc/src/topics.qdoc
	examples/phonon/musicplayer/mainwindow.cpp
	src/3rdparty/freetype/src/base/ftobjs.c
	src/corelib/global/qglobal.h
	src/corelib/tools/qalgorithms.h
	src/corelib/tools/qshareddata.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/corelib/tools/tools.pri
	src/corelib/xml/qxmlstream.h
	src/gui/painting/painting.pri
	src/gui/widgets/qdatetimeedit.cpp
	tests/auto/qdesktopservices/qdesktopservices.pro
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tests/auto/qtextcodec/test/test.pro

4 files changed, 1 insertions, 5 deletions

diff --git a/src/gui/util/qsystemtrayicon.cpp b/src/gui/util/qsystemtrayicon.cpp
index f4d2f7f..64591c7 100644
--- a/src/gui/util/qsystemtrayicon.cpp
+++ b/src/gui/util/qsystemtrayicon.cpp
@@ -65,7 +65,6 @@ QT_BEGIN_NAMESPACE
     \class QSystemTrayIcon
     \brief The QSystemTrayIcon class provides an icon for an application in the system tray.
     \since 4.2
-    \ingroup application
     \ingroup desktop
 
     Modern operating systems usually provide a special area on the desktop,
diff --git a/src/gui/util/qundogroup.cpp b/src/gui/util/qundogroup.cpp
index 9fcfe95..07a3a3d 100644
--- a/src/gui/util/qundogroup.cpp
+++ b/src/gui/util/qundogroup.cpp
@@ -61,7 +61,6 @@ public:
     \class QUndoGroup
     \brief The QUndoGroup class is a group of QUndoStack objects.
     \since 4.2
-    \ingroup misc
 
     For an overview of the Qt's undo framework, see the
     \link qundo.html overview\endlink.
diff --git a/src/gui/util/qundostack.cpp b/src/gui/util/qundostack.cpp
index a5e8004..065cc24 100644
--- a/src/gui/util/qundostack.cpp
+++ b/src/gui/util/qundostack.cpp
@@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE
     \class QUndoCommand
     \brief The QUndoCommand class is the base class of all commands stored on a QUndoStack.
     \since 4.2
-    \ingroup misc
 
     For an overview of Qt's Undo Framework, see the
     \l{Overview of Qt's Undo Framework}{overview document}.
@@ -292,7 +291,6 @@ const QUndoCommand *QUndoCommand::child(int index) const
     \class QUndoStack
     \brief The QUndoStack class is a stack of QUndoCommand objects.
     \since 4.2
-    \ingroup misc
 
     For an overview of Qt's Undo Framework, see the
     \l{Overview of Qt's Undo Framework}{overview document}.
diff --git a/src/gui/util/qundoview.cpp b/src/gui/util/qundoview.cpp
index 0241500..079a62f 100644
--- a/src/gui/util/qundoview.cpp
+++ b/src/gui/util/qundoview.cpp
@@ -253,7 +253,7 @@ QIcon QUndoModel::cleanIcon() const
     \class QUndoView
     \brief The QUndoView class displays the contents of a QUndoStack.
     \since 4.2
-    \ingroup misc
+
     \ingroup advanced
 
     QUndoView is a QListView which displays the list of commands pushed on an undo stack.