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/src.pri | |
| 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/src.pri')
| -rw-r--r-- | src/plugins/platforms/android/src/src.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/src/src.pri b/src/plugins/platforms/android/src/src.pri index 76539b50ab..0fd9ace1fc 100644 --- a/src/plugins/platforms/android/src/src.pri +++ b/src/plugins/platforms/android/src/src.pri @@ -23,7 +23,8 @@ SOURCES += $$PWD/androidplatformplugin.cpp \ $$PWD/qandroidplatformtheme.cpp \ $$PWD/qandroidplatformmenubar.cpp \ $$PWD/qandroidplatformmenu.cpp \ - $$PWD/qandroidplatformmenuitem.cpp + $$PWD/qandroidplatformmenuitem.cpp \ + $$PWD/qandroidsystemlocale.cpp HEADERS += $$PWD/qandroidplatformintegration.h \ @@ -39,7 +40,8 @@ HEADERS += $$PWD/qandroidplatformintegration.h \ $$PWD/qandroidplatformtheme.h \ $$PWD/qandroidplatformmenubar.h \ $$PWD/qandroidplatformmenu.h \ - $$PWD/qandroidplatformmenuitem.h + $$PWD/qandroidplatformmenuitem.h \ + $$PWD/qandroidsystemlocale.h #Non-standard install directory, QTBUG-29859 |