1 files changed, 7 insertions, 17 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 176747aa95..96e630ed0a 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -159,10 +159,8 @@ public:
     inline QPoint pixelDelta() const { return pixelD; }
     inline QPoint angleDelta() const { return angleD; }
 
-#if QT_DEPRECATED_SINCE(5, 0)
-    inline QT_DEPRECATED int delta() const  { return qt4D; }
-    inline QT_DEPRECATED Qt::Orientation orientation() const { return qt4O; }
-#endif
+    inline int delta() const  { return qt4D; }
+    inline Qt::Orientation orientation() const { return qt4O; }
 
 #ifndef QT_NO_INTEGER_EVENT_COORDINATES
     inline QPoint pos() const { return p.toPoint(); }
@@ -461,15 +459,18 @@ public:
     QInputMethodEvent();
     QInputMethodEvent(const QString &preeditText, const QList<Attribute> &attributes);
     void setCommitString(const QString &commitString, int replaceFrom = 0, int replaceLength = 0);
-    QT_DEPRECATED void setTentativeCommitString(const QString &tentativeCommitString);
-
     inline const QList<Attribute> &attributes() const { return attrs; }
     inline const QString &preeditString() const { return preedit; }
 
     inline const QString &commitString() const { return commit; }
     inline int replacementStart() const { return replace_from; }
     inline int replacementLength() const { return replace_length; }
+
+#if QT_DEPRECATED_SINCE(5, 0)
+    QT_DEPRECATED inline void setTentativeCommitString(const QString &string)
+    { tentativeCommit = string;  }
     QT_DEPRECATED inline const QString &tentativeCommitString() const { return tentativeCommit; }
+#endif
 
     QInputMethodEvent(const QInputMethodEvent &other);
 
@@ -684,17 +685,6 @@ protected:
 };
 #endif
 
-#ifndef QT_NO_CLIPBOARD
-class Q_GUI_EXPORT QClipboardEvent : public QEvent
-{
-public:
-    explicit QClipboardEvent(QEventPrivate *data);
-    ~QClipboardEvent();
-
-    QEventPrivate *data() { return d; }
-};
-#endif
-
 class Q_GUI_EXPORT QWindowStateChangeEvent: public QEvent
 {
 public: