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, 3 insertions, 11 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 99500998db..385c5caccc 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -1954,13 +1954,11 @@ bool QApplication::event(QEvent *e)
 }
 
 /*!
+   \fn void QApplication::syncX()
     Was used to synchronize with the X server in 4.x, here for source compatibility.
     \internal
     \obsolete
 */
-void QApplication::syncX()
-{
-}
 
 void QApplicationPrivate::notifyLayoutDirectionChange()
 {
@@ -4247,26 +4245,20 @@ int QApplication::keyboardInputInterval()
 */
 
 /*!
+    \fn QLocale QApplication::keyboardInputLocale()
     \since 4.2
     \obsolete
 
     Returns the current keyboard input locale. Replaced with QInputMethod::locale()
 */
-QLocale QApplication::keyboardInputLocale()
-{
-    return qApp ? qApp->inputMethod()->locale() : QLocale::c();
-}
 
 /*!
+    \fn Qt::LayoutDirection QApplication::keyboardInputDirection()*
     \since 4.2
     \obsolete
 
     Returns the current keyboard input direction. Replaced with QInputMethod::inputDirection()
 */
-Qt::LayoutDirection QApplication::keyboardInputDirection()
-{
-    return qApp ? qApp->inputMethod()->inputDirection() : Qt::LeftToRight;
-}
 
 bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event)
 {