diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 16:10:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 16:10:02 +0200 |
commit | 77c5d38325e35660be86e0bde3c18a7e2180ccf9 (patch) | |
tree | a700928781f46bd60404260dbe13b339fbe7b5fe | |
parent | c3edc76d7c621ddd9015eb9992415be34cf36112 (diff) | |
parent | 3960f026b770ce416a996d70a62acdc586c4fe56 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: I6ab9e89b0a89d5843da5eb43b62b5d32dc8c9ac7
-rw-r--r-- | dist/changes-5.5.0 | 26 | ||||
-rw-r--r-- | src/androidextras/jni/qandroidjniobject.h | 38 |
2 files changed, 49 insertions, 15 deletions
diff --git a/dist/changes-5.5.0 b/dist/changes-5.5.0 new file mode 100644 index 0000000..133dc93 --- /dev/null +++ b/dist/changes-5.5.0 @@ -0,0 +1,26 @@ +Qt 5.5 introduces many new features and improvements as well as bugfixes +over the 5.4.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.5 + +The Qt version 5.5 series is binary compatible with the 5.4.x series. +Applications compiled for 5.4 will continue to run with 5.5. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + +QAndroidJniObject +----------------- + - [QTBUG-43453] Fixed comparison overloads. + - Added convenience functions for jclass, jobject, jobjectArray and jthrowable + - Added the missing jcharArray variant of the callObjectMethod method. diff --git a/src/androidextras/jni/qandroidjniobject.h b/src/androidextras/jni/qandroidjniobject.h index e828f80..c4922d5 100644 --- a/src/androidextras/jni/qandroidjniobject.h +++ b/src/androidextras/jni/qandroidjniobject.h @@ -92,11 +92,13 @@ public: T getField(const char *fieldName) const; template <typename T> QAndroidJniObject getObjectField(const char *fieldName) const; -#ifndef Q_QDOC - // ### Qt 6 remove templated version +#if QT_DEPRECATED_SINCE(5, 5) +# ifndef Q_QDOC template <typename T> + QT_DEPRECATED_X("Use the non-template version instead") QAndroidJniObject getObjectField(const char *fieldName, const char *sig) const; -#endif // Q_QDOC +# endif // Q_QDOC +#endif // QT_DEPRECATED_SINCE QAndroidJniObject getObjectField(const char *fieldName, const char *sig) const; template <typename T> void setField(const char *fieldName, T value); @@ -104,13 +106,15 @@ public: void setField(const char *fieldName, const char *sig, T value); template <typename T> static QAndroidJniObject getStaticObjectField(const char *className, const char *fieldName); -#ifndef Q_QDOC - // ### Qt 6 remove templated version +#if QT_DEPRECATED_SINCE(5, 5) +# ifndef Q_QDOC template <typename T> + QT_DEPRECATED_X("Use the non-template version instead") static QAndroidJniObject getStaticObjectField(const char *className, - const char *fieldName, - const char *sig); -#endif // Q_QDOC + const char *fieldName, + const char *sig); +# endif // Q_QDOC +#endif // QT_DEPRECATED_SINCE static QAndroidJniObject getStaticObjectField(const char *className, const char *fieldName, const char *sig); @@ -118,13 +122,15 @@ public: static T getStaticField(const char *className, const char *fieldName); template <typename T> static QAndroidJniObject getStaticObjectField(jclass clazz, const char *fieldName); -#ifndef Q_QDOC - // ### Qt 6 remove templated version +#if QT_DEPRECATED_SINCE(5, 5) +# ifndef Q_QDOC template <typename T> + QT_DEPRECATED_X("Use the non-template version instead") static QAndroidJniObject getStaticObjectField(jclass clazz, - const char *fieldName, - const char *sig); -#endif // Q_QDOC + const char *fieldName, + const char *sig); +# endif // Q_QDOC +#endif // QT_DEPRECATED_SINCE static QAndroidJniObject getStaticObjectField(jclass clazz, const char *fieldName, const char *sig); @@ -182,17 +188,19 @@ inline bool operator!=(const QAndroidJniObject &obj1, const QAndroidJniObject &o return !obj1.isSameObject(obj2); } +#if QT_DEPRECATED_SINCE(5, 5) template<typename T> -inline bool operator==(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) +QT_DEPRECATED inline bool operator==(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) { return obj1.isSameObject(obj2.object()); } template <typename T> -inline bool operator!=(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) +QT_DEPRECATED inline bool operator!=(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) { return !obj1.isSameObject(obj2.object()); } +#endif // QT_DEPRECATED_SINCE QT_END_NAMESPACE |