summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/kernel/qguiapplication.cpp22
-rw-r--r--src/gui/kernel/qguiapplication.h3
-rw-r--r--src/widgets/kernel/qapplication.cpp22
-rw-r--r--src/widgets/kernel/qapplication.h3
4 files changed, 25 insertions, 25 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index f92e66b38e..c89e144c84 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1521,28 +1521,6 @@ uint QGuiApplicationPrivate::currentKeyPlatform()
}
/*!
- \since 4.2
- \obsolete
-
- Returns the current keyboard input locale. Replaced with QInputPanel::locale()
-*/
-QLocale QGuiApplication::keyboardInputLocale()
-{
- return qApp ? qApp->inputPanel()->locale() : QLocale::c();
-}
-
-/*!
- \since 4.2
- \obsolete
-
- Returns the current keyboard input direction. Replaced with QInputPanel::inputDirection()
-*/
-Qt::LayoutDirection QGuiApplication::keyboardInputDirection()
-{
- return qApp ? qApp->inputPanel()->inputDirection() : Qt::LeftToRight;
-}
-
-/*!
\since 4.5
\fn void QGuiApplication::fontDatabaseChanged()
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index dd7b1f8806..a07e13332e 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -119,9 +119,6 @@ public:
static inline bool isRightToLeft() { return layoutDirection() == Qt::RightToLeft; }
static inline bool isLeftToRight() { return layoutDirection() == Qt::LeftToRight; }
- QT_DEPRECATED static QLocale keyboardInputLocale();
- QT_DEPRECATED static Qt::LayoutDirection keyboardInputDirection();
-
QStyleHints *styleHints() const;
QInputPanel *inputPanel() const;
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index fc295eb874..cbd744f7e7 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -4967,6 +4967,28 @@ QInputContext *QApplication::inputContext() const
}
#endif // QT_NO_IM
+/*!
+ \since 4.2
+ \obsolete
+
+ Returns the current keyboard input locale. Replaced with QInputPanel::locale()
+*/
+QLocale QApplication::keyboardInputLocale()
+{
+ return qApp ? qApp->inputPanel()->locale() : QLocale::c();
+}
+
+/*!
+ \since 4.2
+ \obsolete
+
+ Returns the current keyboard input direction. Replaced with QInputPanel::inputDirection()
+*/
+Qt::LayoutDirection QApplication::keyboardInputDirection()
+{
+ return qApp ? qApp->inputPanel()->inputDirection() : Qt::LeftToRight;
+}
+
bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event)
{
return QGuiApplication::sendSpontaneousEvent(receiver, event);
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h
index 4347aa3521..c0182122a8 100644
--- a/src/widgets/kernel/qapplication.h
+++ b/src/widgets/kernel/qapplication.h
@@ -226,6 +226,9 @@ public:
QInputContext *inputContext() const;
#endif
+ QT_DEPRECATED static QLocale keyboardInputLocale();
+ QT_DEPRECATED static Qt::LayoutDirection keyboardInputDirection();
+
static int exec();
bool notify(QObject *, QEvent *);