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

3 files changed, 0 insertions, 203 deletions

diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 0c3a3b8777..213f0e4a58 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -507,14 +507,6 @@ QChildEvent::~QChildEvent()
 
 
 /*!
-    \fn bool QChildEvent::inserted() const
-
-    \compat
-
-    A child has been inserted if the event's type() is ChildInserted.
-*/
-
-/*!
     \class QDynamicPropertyChangeEvent
     \since 4.2
     \brief The QDynamicPropertyChangeEvent class contains event parameters for dynamic
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 08236a3fec..a282ae007c 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -3775,67 +3775,6 @@ QDebug operator<<(QDebug dbg, const QObject *o) {
 #endif
 
 /*!
-  \fn void QObject::insertChild(QObject *object)
-
-  Use setParent() instead, i.e., call object->setParent(this).
-*/
-
-/*!
-  \fn void QObject::removeChild(QObject *object)
-
-  Use setParent() instead, i.e., call object->setParent(0).
-*/
-
-/*!
-  \fn bool QObject::isA(const char *className) const
-
-  Compare \a className with the object's metaObject()->className() instead.
-*/
-
-/*!
-  \fn const char *QObject::className() const
-
-  Use metaObject()->className() instead.
-*/
-
-/*!
-  \fn const char *QObject::name() const
-
-  Use objectName() instead.
-*/
-
-/*!
-  \fn const char *QObject::name(const char *defaultName) const
-
-  Use objectName() instead.
-*/
-
-/*!
-  \fn void QObject::setName(const char *name)
-
-  Use setObjectName() instead.
-*/
-
-/*!
-  \fn bool QObject::checkConnectArgs(const char *signal, const
-  QObject *object, const char *method)
-
-  Use QMetaObject::checkConnectArgs() instead.
-*/
-
-/*!
-  \fn QByteArray QObject::normalizeSignalSlot(const char *signalSlot)
-
-  Use QMetaObject::normalizedSignature() instead.
-*/
-
-/*!
-  \fn const char *QMetaObject::superClassName() const
-
-  \internal
-*/
-
-/*!
     \macro Q_CLASSINFO(Name, Value)
     \relates QObject
 
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 01e12ee968..3144df00bb 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2576,14 +2576,6 @@ QVariantList QVariant::toList() const
     return qVariantToHelper<QVariantList>(d, List, handler);
 }
 
-/*! \fn QVariant::canCast(Type t) const
-    Use canConvert() instead.
-*/
-
-/*! \fn QVariant::cast(Type t)
-    Use convert() instead.
-*/
-
 
 static const quint32 qCanConvertMatrix[QVariant::LastCoreType + 1] =
 {
@@ -2922,132 +2914,6 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p)
 }
 #endif
 
-/*!
-    \fn int &QVariant::asInt()
-
-    Use toInt() instead.
-*/
-
-/*!
-    \fn uint &QVariant::asUInt()
-
-    Use toUInt() instead.
-*/
-
-/*!
-    \fn qlonglong &QVariant::asLongLong()
-
-    Use toLongLong() instead.
-*/
-
-/*!
-    \fn qulonglong &QVariant::asULongLong()
-
-    Use toULongLong() instead.
-*/
-
-/*!
-    \fn bool &QVariant::asBool()
-
-    Use toBool() instead.
-*/
-
-/*!
-    \fn double &QVariant::asDouble()
-
-    Use toDouble() instead.
-*/
-
-/*!
-    \fn QByteArray &QVariant::asByteArray()
-
-    Use toByteArray() instead.
-*/
-
-/*!
-    \fn QBitArray &QVariant::asBitArray()
-
-    Use toBitArray() instead.
-*/
-
-/*!
-    \fn QString &QVariant::asString()
-
-    Use toString() instead.
-*/
-
-/*!
-    \fn QStringList &QVariant::asStringList()
-
-    Use toStringList() instead.
-*/
-
-/*!
-    \fn QDate &QVariant::asDate()
-
-    Use toDate() instead.
-*/
-
-/*!
-    \fn QTime &QVariant::asTime()
-
-    Use toTime() instead.
-*/
-
-/*!
-    \fn QDateTime &QVariant::asDateTime()
-
-    Use toDateTime() instead.
-*/
-
-/*!
-    \fn QList<QVariant> &QVariant::asList()
-
-    Use toList() instead.
-*/
-
-/*!
-    \fn QMap<QString, QVariant> &QVariant::asMap()
-
-    Use toMap() instead.
-*/
-
-/*!
-    \fn QVariant::QVariant(bool b, int dummy)
-
-    Use the QVariant(bool) constructor instead.
-
-*/
-
-/*!
-    \fn const QByteArray QVariant::toCString() const
-
-    Use toByteArray() instead.
-*/
-
-/*!
-    \fn QByteArray &QVariant::asCString()
-
-    Use toByteArray() instead.
-*/
-
-/*!
-    \fn QPoint &QVariant::asPoint()
-
-    Use toPoint() instead.
- */
-
-/*!
-    \fn QRect &QVariant::asRect()
-
-    Use toRect() instead.
- */
-
-/*!
-    \fn QSize &QVariant::asSize()
-
-    Use toSize() instead.
- */
 
 /*! \fn void QVariant::setValue(const T &value)