summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Krause <vkrause@kde.org>2020-03-14 13:45:10 +0100
committerVolker Krause <vkrause@kde.org>2020-03-17 08:30:32 +0100
commitc53cccc171c2da803cfd247e95c5dd48e5610c3b (patch)
tree01f879c81799131abc49f150e406f9e4231c176f
parent97422abcfcdf2c5c5b81b9de05ceb7bef6edcf13 (diff)
Fix JNI signature for the timezone getDisplayName call
Due to the changes in 5.14.1 this code now actually seems to be hit here, throwing NoSuchMethodError exceptions all over the place and breaking date/time handling quite spectacularly. Change-Id: I9bee3de39ec98f86d7944b94e89119505f62dc6c Reviewed-by: BogDan Vatra <bogdan@kdab.com>
-rw-r--r--src/corelib/time/qtimezoneprivate_android.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/time/qtimezoneprivate_android.cpp b/src/corelib/time/qtimezoneprivate_android.cpp
index 5cb8155dcc..fc3653752a 100644
--- a/src/corelib/time/qtimezoneprivate_android.cpp
+++ b/src/corelib/time/qtimezoneprivate_android.cpp
@@ -102,7 +102,7 @@ void QAndroidTimeZonePrivate::init(const QByteArray &ianaId)
for (int style = 1; m_id.isEmpty() && style-- > 0;) {
for (int dst = 1; m_id.isEmpty() && dst-- > 0;) {
m_id = match(androidTimeZone.callObjectMethod(
- "getDisplayName", "(ZI;)Ljava/lang/String;", bool(dst), style));
+ "getDisplayName", "(ZI)Ljava/lang/String;", bool(dst), style));
}
}
}