Fix compilation of public headers with QT_NO_DEPRECATED defined

Put the functions in QT_DEPRECATED_SINCE if possible

QPluginLoader::staticInstances is not documented as deprecated, and do
not reference any alternative use. So I unmarked it as deprecated.

Change-Id: I556c3f3657fb0490dd5543fcc56718fe9bd394e7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 4c019938b8..f611fe4ab7 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -458,15 +458,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);