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, 1 insertions, 32 deletions

diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index 791b207dea..831a403975 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -89,9 +89,6 @@ public:
         Quit = 20,                              // request to quit application
         ParentChange = 21,                      // widget has been reparented
         ParentAboutToChange = 131,              // sent just before the parent change is done
-#ifdef QT3_SUPPORT
-        Reparent = ParentChange,
-#endif
         ThreadChange = 22,                      // object has changed threads
         WindowActivate = 24,                    // window was activated
         WindowDeactivate = 25,                  // window was deactivated
@@ -118,11 +115,6 @@ public:
         DragResponse = 64,                      // drag accepted/rejected
         ChildAdded = 68,                        // new child widget
         ChildPolished = 69,                     // polished child widget
-#ifdef QT3_SUPPORT
-        ChildInsertedRequest = 67,              // send ChildInserted compatibility events to receiver
-        ChildInserted = 70,                     // compatibility child inserted
-        LayoutHint = 72,                        // compatibility relayout request
-#endif
         ChildRemoved = 71,                      // deleted child widget
         ShowWindowRequest = 73,                 // widget's window should be mapped
         PolishRequest = 74,                     // widget should be polished
@@ -174,18 +166,8 @@ public:
         Shortcut = 117,                         // shortcut triggered
         ShortcutOverride = 51,                  // shortcut override request
 
-#ifdef QT3_SUPPORT
-        Accel = 30,                             // accelerator event
-        AccelAvailable = 32,                    // accelerator available event
-        AccelOverride = ShortcutOverride,       // accelerator override event
-#endif
-
         WhatsThisClicked = 118,
 
-#ifdef QT3_SUPPORT
-        CaptionChange = WindowTitleChange,
-        IconChange = WindowIconChange,
-#endif
         ToolBarChange = 120,                    // toolbar visibility toggled
 
         ApplicationActivate = 121,              // application has been changed to active
@@ -297,6 +279,7 @@ public:
         Expose = 208,
 
         InputMethodQuery = 209,
+        OrientationChange = 210,                // Screen orientation has changed
 
         // 512 reserved for Qt Jambi's MetaCall event
         // 513 reserved for Qt Jambi's DeleteOnMainThread event
@@ -364,26 +347,12 @@ public:
     ~QChildEvent();
     QObject *child() const { return c; }
     bool added() const { return type() == ChildAdded; }
-#ifdef QT3_SUPPORT
-    QT3_SUPPORT bool inserted() const { return type() == ChildInserted; }
-#endif
     bool polished() const { return type() == ChildPolished; }
     bool removed() const { return type() == ChildRemoved; }
 protected:
     QObject *c;
 };
 
-#ifdef QT3_SUPPORT
-class Q_CORE_EXPORT QCustomEvent : public QEvent
-{
-public:
-    QT3_SUPPORT_CONSTRUCTOR QCustomEvent(int type, void *data = 0);
-    ~QCustomEvent();
-    QT3_SUPPORT void *data()  const { return d; }
-    QT3_SUPPORT void setData(void* aData) { d = reinterpret_cast<QEventPrivate *>(aData); }
-};
-#endif
-
 class Q_CORE_EXPORT QDynamicPropertyChangeEvent : public QEvent
 {
 public: