diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-08-18 00:24:25 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-08-18 00:24:25 +0900 |
| commit | a401ecd325ce463c73c0111d6197590ace3d0263 (patch) | |
| tree | f99b503359b132a1c52fad6fb9bc55c9668f72c7 | |
| parent | dbc8742f9e8f6828a653ca500ec6ab40fb8ae7cd (diff) | |
| download | qt3-a401ecd325ce463c73c0111d6197590ace3d0263.tar.gz qt3-a401ecd325ce463c73c0111d6197590ace3d0263.zip | |
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.
| -rw-r--r-- | src/kernel/qmetaobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ QMetaObjectCleanUp::~QMetaObjectCleanUp() 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; |