summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:26:42 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:26:42 +0200
commit1fe941917a3c93d74e9058f8ca9ed2b6b8ac78a3 (patch)
treee2d6638089d69c7d0497923a320f146b9d3eb47a
parent77c5d38325e35660be86e0bde3c18a7e2180ccf9 (diff)
parenta3ec0e469e9fbc49af3151f9f747ee980fae22cd (diff)
Merge remote-tracking branch 'origin/5.5' into dev
-rw-r--r--src/androidextras/jni/qandroidjniobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/androidextras/jni/qandroidjniobject.cpp b/src/androidextras/jni/qandroidjniobject.cpp
index ca26f8a..ebdd73d 100644
--- a/src/androidextras/jni/qandroidjniobject.cpp
+++ b/src/androidextras/jni/qandroidjniobject.cpp
@@ -359,7 +359,7 @@ QT_BEGIN_NAMESPACE
\code
QAndroidJniObject myJavaString; ==> "Hello, Java"
- QAndroidJniObject mySubstring = myJavaString.callObjectMethod("substring", "(II)Ljava/lang/String;" 7, 10);
+ QAndroidJniObject mySubstring = myJavaString.callObjectMethod("substring", "(II)Ljava/lang/String;", 7, 10);
\endcode
*/