summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qapplication.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
-rw-r--r--src/widgets/kernel/qapplication.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index f672aef0eb..734c737e84 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()
{
@@ -2980,6 +2978,8 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
d->checkReceiverThread(receiver);
#endif
+ QGuiApplicationPrivate::sendQWindowEventToQPlatformWindow(qobject_cast<QWindow *>(receiver), e);
+
// capture the current mouse/keyboard state
if(e->spontaneous()) {
if (e->type() == QEvent::MouseButtonPress
@@ -4245,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)
{