From f0bff64751c7d6911be3578d7578bae8180e987d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 18 Aug 2014 00:14:55 +0900 Subject: [PATCH] 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(-) diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp index 75bd9b5a..df59af7f 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;