From dbc8742f9e8f6828a653ca500ec6ab40fb8ae7cd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 18 Aug 2014 00:23:20 +0900 Subject: Revert "Fixed warning message if QMetaObjectCleanUp::setMetaObject is invoked twice." because of wrong reference to bug 1887. This reverts commit 41f30477dd877e37ed79b42253b79d6441dab7d9. --- 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 ba12615..9a86686 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 && metaObject != &mo) + if ( metaObject ) qWarning( "QMetaObjectCleanUp::setMetaObject: Double use of QMetaObjectCleanUp!" ); #endif metaObject = &mo; -- cgit v1.2.1