|
686236f3
|
2014-08-17 10:19:17
|
Michele Calgaro
|
Revert "Fixed warning message if QMetaObjectCleanUp::setMetaObject is invoked twice."
because of wrong reference to bug 1887.
This reverts commit f0bff64751c7d6911be3578d7578bae8180e987d.
|
M src/kernel/qmetaobject.cpp
|
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index df59af7..75bd9b5 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -1244,7 +1244,7 @@
void TQMetaObjectCleanUp::setMetaObject( TQMetaObject *&mo )
{
#if defined(QT_CHECK_RANGE)
- if (metaObject && metaObject != &mo)
+ if ( metaObject )
tqWarning( "TQMetaObjectCleanUp::setMetaObject: Double use of TQMetaObjectCleanUp!" );
#endif
metaObject = &mo;
|
|
85e2ff9c
|
2014-08-17 10:22:12
|
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 75bd9b5..df59af7 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -1244,7 +1244,7 @@
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;
|