|
dbc8742f
|
2014-08-17 10:23:20
|
Michele Calgaro
|
Revert "Fixed warning message if QMetaObjectCleanUp::setMetaObject is invoked twice."
because of wrong reference to bug 1887.
This reverts commit 41f30477dd877e37ed79b42253b79d6441dab7d9.
|
M src/kernel/qmetaobject.cpp
|
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 @@
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;
|
|
a401ecd3
|
2014-08-17 10:24:25
|
Michele Calgaro
|
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.
|
M src/kernel/qmetaobject.cpp
|
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 @@
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;
|