From 41f30477dd877e37ed79b42253b79d6441dab7d9 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 18 Aug 2014 00:17:15 +0900
Subject: 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.

---
 src/kernel/qmetaobject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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 @@ QMetaObjectCleanUp::~QMetaObjectCleanUp()
 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;
-- 
cgit v1.2.1