Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I110c2737eab4b310ebcc6c245808fc032db61677

1 files changed, 0 insertions, 30 deletions

diff --git a/src/androidextras/jni/qandroidjniobject.cpp b/src/androidextras/jni/qandroidjniobject.cpp
index 45ee506..ca26f8a 100644
--- a/src/androidextras/jni/qandroidjniobject.cpp
+++ b/src/androidextras/jni/qandroidjniobject.cpp
@@ -684,42 +684,12 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn bool operator==(const QAndroidJniObject &o1, T o2)
-    \relates QAndroidJniObject
-
-    Returns true if both objects, \a o1 and \a o2, are referencing the same Java object, or if both
-    are NULL. In any other cases false will be returned.
-*/
-
-/*!
-    \fn bool operator==(T o1, const QAndroidJniObject &o2)
-    \relates QAndroidJniObject
-
-    Returns true if both objects, \a o1 and \a o2, are referencing the same Java object, or if both
-    are NULL. In any other cases false will be returned.
-*/
-
-/*!
     \fn bool operator!=(const QAndroidJniObject &o1, const QAndroidJniObject &o2)
     \relates QAndroidJniObject
 
     Returns true if \a o1 holds a reference to a different object then \a o2.
 */
 
-/*!
-    \fn bool operator!=(const QAndroidJniObject &o1, T o2)
-    \relates QAndroidJniObject
-
-    Returns true if \a o1 holds a reference to a different object then \a o2.
-*/
-
-/*!
-    \fn bool operator!=(T o1, const QAndroidJniObject &o2)
-    \relates QAndroidJniObject
-
-    Returns true if \a o1 is referencing a different object then \a o2.
-*/
-
 
 QAndroidJniObject::QAndroidJniObject(const char *className, const char *sig, ...)
 {