diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-08-18 00:24:25 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-15 19:54:00 +0100 |
| commit | b0291308c4c07de212c55a7f3f75cc9983305d67 (patch) | |
| tree | fa8be065c0ada8cd7552107ec8961c35892d596a | |
| parent | 3bffdfb381d69910750a7a8e61ad42e1b86ef25a (diff) | |
| download | qt3-b0291308c4c07de212c55a7f3f75cc9983305d67.tar.gz qt3-b0291308c4c07de212c55a7f3f75cc9983305d67.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.
(cherry picked from commit a401ecd325ce463c73c0111d6197590ace3d0263)
| -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; |