diff options
| author | Michele Calgaro <[email protected]> | 2014-08-18 00:17:15 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2014-08-18 00:17:15 +0900 |
| commit | 41f30477dd877e37ed79b42253b79d6441dab7d9 (patch) | |
| tree | f99b503359b132a1c52fad6fb9bc55c9668f72c7 /src | |
| parent | 93b3efa8902c19e9b67114652dc84c463f8c219a (diff) | |
| download | qt3-41f30477dd877e37ed79b42253b79d6441dab7d9.tar.gz qt3-41f30477dd877e37ed79b42253b79d6441dab7d9.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 1887.
Diffstat (limited to 'src')
| -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; |