diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-27 18:53:09 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-27 18:53:09 +0100 |
| commit | 5c5b80e150896fc526836fa4ce96ac19d505c820 (patch) | |
| tree | 3bdce6fa66f8b35fb5ed86db6ce69146840c57fc | |
| parent | 483bba7e93efa0bba2726ed1de923f330dc6b55a (diff) | |
| parent | 09c0570ce76576074fa0dd98276d959fe0287317 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I904858b3d308c48caaa05c0fba6ce687f5856589
| -rw-r--r-- | src/androidextras/jni/qandroidjniobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/androidextras/jni/qandroidjniobject.cpp b/src/androidextras/jni/qandroidjniobject.cpp index 141d604..9d38afd 100644 --- a/src/androidextras/jni/qandroidjniobject.cpp +++ b/src/androidextras/jni/qandroidjniobject.cpp @@ -156,14 +156,14 @@ QT_BEGIN_NAMESPACE \li Signature \row \li jobject - \li {1, 3} L\e<fully-qulified-name>; + \li {1, 3} L\e<fully-qualified-name>; \row \li jclass \row \li jstring \row \li jobjectArray - \li [L\e<fully-qulified-name>; + \li [L\e<fully-qualified-name>; \row \li jarray \li [\e<type> |