diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-06-27 17:14:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-04 12:14:03 +0200 |
| commit | f84dc0ff62234c871f30c1b51121ba2beb65e968 (patch) | |
| tree | 9f600e29b799f4c183bd34e47dea9593bf3a37ef /src/plugins/platforms/android/src/qandroidplatformintegration.h | |
| parent | 0d7f22fc672b4a0c1273ead0b581706902bdc649 (diff) | |
Implement system locale for Android
On Android, we would default to C locale always. We need a connection
to Java in order to get the locale, so this has to be done in the
platform plugin rather than the QtCore library. It's enough to
instantiate the QSystemLocale subclass, since this will automatically
register itself as the current system locale.
Task-number: QTBUG-31651
Change-Id: I76f3e30f7dff90e8101cb560cee2b96c9300d9af
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/plugins/platforms/android/src/qandroidplatformintegration.h')
| -rw-r--r-- | src/plugins/platforms/android/src/qandroidplatformintegration.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/src/qandroidplatformintegration.h b/src/plugins/platforms/android/src/qandroidplatformintegration.h index 8da9fb2ff4..0e3a48c9f0 100644 --- a/src/plugins/platforms/android/src/qandroidplatformintegration.h +++ b/src/plugins/platforms/android/src/qandroidplatformintegration.h @@ -60,6 +60,7 @@ QT_BEGIN_NAMESPACE class QDesktopWidget; class QAndroidPlatformServices; +class QAndroidSystemLocale; #ifdef ANDROID_PLUGIN_OPENGL class QAndroidOpenGLPlatformWindow; @@ -152,6 +153,7 @@ private: QAndroidPlatformNativeInterface *m_androidPlatformNativeInterface; QAndroidPlatformServices *m_androidPlatformServices; QPlatformClipboard *m_androidPlatformClipboard; + QAndroidSystemLocale *m_androidSystemLocale; mutable QAndroidInputContext m_platformInputContext; }; |