Merge remote branch 'gerrit/master' into refactor

Conflicts:
	config.tests/unix/opengldesktop/opengldesktop.cpp
	examples/itemviews/interview/interview.pro
	examples/mainwindows/mainwindow/mainwindow.pro
	examples/openvg/README
	examples/richtext/textedit/textedit.pro
	examples/tools/undo/undo.pro
	src/corelib/global/qglobal.h
	src/corelib/kernel/qcoreapplication.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qmetatype.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qevent.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/painting/qpaintengine_raster_p.h
	src/gui/text/qfontdatabase.cpp
	src/opengl/qgl.h
	src/openvg/qpaintengine_vg.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	tests/auto/qmainwindow/qmainwindow.pro

Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234

1 files changed, 0 insertions, 59 deletions

diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 49c6da42c6..0c3a3b8777 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -505,65 +505,6 @@ QChildEvent::~QChildEvent()
     false.
 */
 
-/*!
-    \class QCustomEvent
-    \brief The QCustomEvent class provides support for custom events.
-
-    \compat
-
-    QCustomEvent has a \c{void *} that can be used to store custom
-    data.
-
-    In Qt 3, QObject::customEvent() took a QCustomEvent pointer. We
-    found out that this approach was unsatisfactory, because
-    there was often no safe way of deleting the data held in the
-    \c{void *}.
-
-    In Qt 4, QObject::customEvent() takes a plain QEvent pointer.
-    You can add custom data by subclassing.
-
-    \sa QObject::customEvent(), QCoreApplication::notify()
-*/
-
-/*!
-    \fn QCustomEvent::QCustomEvent(int type, void *data)
-
-    Constructs a custom event object with the event \a type and a
-    pointer to \a data. The value of \a type must be at least as
-    large as QEvent::User. By default, the data pointer is set to 0.
-*/
-#ifdef QT3_SUPPORT
-QCustomEvent::QCustomEvent(int type, void *data)
-    : QEvent(static_cast<Type>(type))
-{
-    d = reinterpret_cast<QEventPrivate *>(data);
-}
-
-/*! \internal
-*/
-QCustomEvent::~QCustomEvent()
-{
-}
-#endif
-/*!
-    \fn void QCustomEvent::setData(void *data)
-
-    \compat
-
-    Sets the generic data pointer to \a data.
-
-    \sa data()
-*/
-
-/*!
-    \fn void *QCustomEvent::data() const
-
-    \compat
-
-    Returns a pointer to the generic event data.
-
-    \sa setData()
-*/
 
 /*!
     \fn bool QChildEvent::inserted() const