summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-08-18 00:23:20 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-08-18 00:23:20 +0900
commitdbc8742f9e8f6828a653ca500ec6ab40fb8ae7cd (patch)
treeaa0f907f2c1c2f2dd6da5b8ca9c09f41c56be11b
parent41f30477dd877e37ed79b42253b79d6441dab7d9 (diff)
downloadqt3-dbc8742f9e8f6828a653ca500ec6ab40fb8ae7cd.tar.gz
qt3-dbc8742f9e8f6828a653ca500ec6ab40fb8ae7cd.zip
Revert "Fixed warning message if QMetaObjectCleanUp::setMetaObject is invoked twice."
because of wrong reference to bug 1887. This reverts commit 41f30477dd877e37ed79b42253b79d6441dab7d9.
-rw-r--r--src/kernel/qmetaobject.cpp2
1 files changed, 1 insertions, 1 deletions
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;