summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qapplication.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-09-28 23:06:00 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-29 08:56:26 +0200
commitdb3418c10b7831db0e6c567ccf49c34698cad1ab (patch)
treeccab363c9c83a1127214a59be6be6aee0a512dcd /src/widgets/kernel/qapplication.cpp
parent1cc70b92c8c838a013b45af6814ea6532245067a (diff)
Fix the qtranslator autotest
Properly propagate the language change event to all widgets. Change-Id: I6650205abe1acc6979e28ca5c5dde5ae33a406b9 Reviewed-on: http://codereview.qt-project.org/5758 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
-rw-r--r--src/widgets/kernel/qapplication.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 1f4016bd95..74336bec28 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -2302,7 +2302,6 @@ bool QApplication::event(QEvent *e)
d->toolTipFallAsleep.stop();
}
}
- return QApplicationBase::event(e);
if(e->type() == QEvent::LanguageChange) {
#if defined(QT_MAC_USE_COCOA)
@@ -2316,7 +2315,9 @@ bool QApplication::event(QEvent *e)
}
}
+ return QApplicationBase::event(e);
}
+
#if !defined(Q_WS_X11)
// The doc and X implementation of this function is in qapplication_x11.cpp