Merge remote branch 'gerrit/master' into refactor

Conflicts:
	examples/opengl/cube/main.cpp
	examples/widgets/applicationicon/main.cpp
	examples/widgets/orientation/main.cpp
	src/gui/image/qicon.cpp
	src/gui/image/qimage.h
	src/gui/image/qpixmap.h
	src/gui/image/qpixmap_mac.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qpalette.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/styles/qmacstyle_mac.mm
	src/gui/widgets/qmenubar.cpp
	src/gui/widgets/qslider.cpp
	src/opengl/qwindowsurface_gl.cpp
	tests/auto/qvariant/qvariant.pro
	tests/benchmarks/corelib/kernel/qobject/qobject.pro
	tests/benchmarks/gui/animation/qanimation/qanimation.pro
	tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
	tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
	tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
	tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
	tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
	tests/benchmarks/gui/image/qimagereader/qimagereader.pro
	tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
	tests/benchmarks/gui/kernel/qapplication/qapplication.pro
	tests/benchmarks/gui/kernel/qwidget/qwidget.pro
	tests/benchmarks/gui/painting/qpainter/qpainter.pro
	tests/benchmarks/gui/painting/qtbench/qtbench.pro
	tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
	tests/benchmarks/gui/text/qtext/qtext.pro

Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30

1 files changed, 0 insertions, 87 deletions

diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp
index 266fc7d3f1..97298dde3d 100644
--- a/src/corelib/tools/qlinkedlist.cpp
+++ b/src/corelib/tools/qlinkedlist.cpp
@@ -1054,93 +1054,6 @@ QLinkedListData QLinkedListData::shared_null = {
 */
 
 /*!
-    \fn iterator QLinkedList::remove(iterator pos)
-
-    Use erase() instead.
-*/
-
-/*!
-    \fn int QLinkedList::findIndex(const T& t) const
-
-    If you need indexes then QList or QVector are better choices than
-    QLinkedList.
-
-    \oldcode
-    int index = list->findIndex(value);
-    \newcode
-    int index = 0;
-    bool found = false;
-    for (const_iterator i = list->begin(); i != list->end(); ++i; ++index)
-        if (*i == value) {
-            found = true;
-            break;
-        }
-    if (!found)
-        index = -1;
-    \endcode
-*/
-
-/*!
-    \fn iterator QLinkedList::find(iterator from, const T& t)
-
-    If you need random access to a data structure then QList, QVector,
-    QMap, or QHash, are all better choices than QLinkedList.
-
-    \oldcode
-    QLinkedList::iterator i = list->find(from, value);
-    \newcode
-    QLinkedList::iterator i = from;
-    while (i != list->end() && *i != value)
-        ++i;
-    \endcode
-*/
-
-/*!
-    \fn iterator QLinkedList::find(const T& t)
-
-    If you need random access to a data structure then QList, QVector,
-    QMap, or QHash, are all better choices than QLinkedList.
-
-    \oldcode
-    QLinkedList::iterator i = list->find(value);
-    \newcode
-    QLinkedList::iterator i = list->begin();
-    while (i != list->end() && *i != value)
-        ++i;
-    \endcode
-*/
-
-/*!
-    \fn const_iterator QLinkedList::find(const_iterator from, const T& t) const
-
-    If you need random access to a data structure then QList, QVector,
-    QMap, or QHash, are all better choices than QLinkedList.
-
-    \oldcode
-    QLinkedList::const_iterator i = list->find(from, value);
-    \newcode
-    QLinkedList::const_iterator i = from;
-    while (i != list->end() && *i != value)
-        ++i;
-    \endcode
-*/
-
-/*!
-    \fn const_iterator QLinkedList::find(const T& t) const
-
-    If you need random access to a data structure then QList, QVector,
-    QMap, or QHash, are all better choices than QLinkedList.
-
-    \oldcode
-    QLinkedList::const_iterator i = list->find(value);
-    \newcode
-    QLinkedList::const_iterator i = list->begin();
-    while (i != list->end() && *i != value)
-        ++i;
-    \endcode
-*/
-
-/*!
     \since 4.1
     \fn QLinkedList<T> QLinkedList<T>::fromStdList(const std::list<T> &list)