From 85e2ff9cf6d3a3868595c8bcefe556e34ecb16d4 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 18 Aug 2014 00:22:12 +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 1947.

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

(limited to 'src/kernel')

diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index 75bd9b5a7..df59af7fe 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -1244,7 +1244,7 @@ TQMetaObjectCleanUp::~TQMetaObjectCleanUp()
 void TQMetaObjectCleanUp::setMetaObject( TQMetaObject *&mo )
 {
 #if defined(QT_CHECK_RANGE)
-    if ( metaObject )
+    if (metaObject && metaObject != &mo)
 	tqWarning( "TQMetaObjectCleanUp::setMetaObject: Double use of TQMetaObjectCleanUp!" );
 #endif
     metaObject = &mo;
-- 
cgit v1.2.1