diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-17 18:20:12 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-17 18:20:12 +0000 |
| commit | cc5d8168001e652c045ff42685edf257ce00603c (patch) | |
| tree | 6320f169d621bed128f08d92676035a8e2f2ab23 /src/corelib/tools/qtimezoneprivate_android.cpp | |
| parent | a9dfe71cca38e6b62445292ed2c6ec1c8224430a (diff) | |
| parent | 1783fca89768a9d503d886673643dc4542ec467f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate_android.cpp')
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_android.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_android.cpp b/src/corelib/tools/qtimezoneprivate_android.cpp index b60093617f..be4f374fdd 100644 --- a/src/corelib/tools/qtimezoneprivate_android.cpp +++ b/src/corelib/tools/qtimezoneprivate_android.cpp @@ -85,10 +85,9 @@ void QAndroidTimeZonePrivate::init(const QByteArray &ianaId) // Painfully, JNI gives us back a default zone object if it doesn't // recognize the name; so check for whether ianaId is a recognized name of // the zone object we got and ignore the zone if not. - bool found = false; // Try checking ianaId against getID(), getDisplayName(): QJNIObjectPrivate jname = androidTimeZone.callObjectMethod("getID", "()Ljava/lang/String;"); - found = (jname.toString().toUtf8() == ianaId); + bool found = (jname.toString().toUtf8() == ianaId); for (int style = 1; !found && style-- > 0;) { for (int dst = 1; !found && dst-- > 0;) { jname = androidTimeZone.callObjectMethod("getDisplayName", "(ZI;)Ljava/lang/String;", |