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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/plugins/platforms/android/src/qandroidplatformintegration.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp index f0630b5224..03503ec632 100644 --- a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp @@ -66,6 +66,7 @@ #endif #include "qandroidplatformtheme.h" +#include "qandroidsystemlocale.h" QT_BEGIN_NAMESPACE @@ -108,6 +109,8 @@ QAndroidPlatformIntegration::QAndroidPlatformIntegration(const QStringList ¶ m_androidFDB = new QAndroidPlatformFontDatabase(); m_androidPlatformServices = new QAndroidPlatformServices(); m_androidPlatformClipboard = new QAndroidPlatformClipboard(); + + m_androidSystemLocale = new QAndroidSystemLocale; } bool QAndroidPlatformIntegration::hasCapability(Capability cap) const @@ -183,6 +186,7 @@ QAndroidPlatformIntegration::~QAndroidPlatformIntegration() { delete m_androidPlatformNativeInterface; delete m_androidFDB; + delete m_androidSystemLocale; QtAndroid::setAndroidPlatformIntegration(NULL); } QPlatformFontDatabase *QAndroidPlatformIntegration::fontDatabase() const |