Branch: master

41f30477 2014-08-17 10:17:15 Michele Calgaro
Fixed warning message if QMetaObjectCleanUp::setMetaObject is invoked twice.
If the passed object is the same, the warning message is not displayed any more.
If the passed object is different, a message is still displayed.
This resolves bug 1887.
M src/kernel/qmetaobject.cpp
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index 9a86686..ba12615 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -1244,7 +1244,7 @@
 void QMetaObjectCleanUp::setMetaObject( QMetaObject *&mo )
 {
 #if defined(QT_CHECK_RANGE)
-    if ( metaObject )
+    if (metaObject && metaObject != &mo)
 	qWarning( "QMetaObjectCleanUp::setMetaObject: Double use of QMetaObjectCleanUp!" );
 #endif
     metaObject = &mo;