diff options
| author | Michele Calgaro <[email protected]> | 2014-08-18 00:14:55 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2014-08-18 00:14:55 +0900 |
| commit | f0bff64751c7d6911be3578d7578bae8180e987d (patch) | |
| tree | a69263653227caf0c5cb296c50eba0554fb0c6e0 | |
| parent | e45396f47ad04cc316f972140ac83c0de409be1b (diff) | |
| download | tqt3-f0bff64751c7d6911be3578d7578bae8180e987d.tar.gz tqt3-f0bff64751c7d6911be3578d7578bae8180e987d.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.
| -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 75bd9b5a7..df59af7fe 100644 --- a/src/kernel/qmetaobject.cpp +++ b/src/kernel/qmetaobject.cpp @@ -1244,7 +1244,7 @@ TQMetaObjectCleanUp::~TQMetaObjectCleanUp() 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; |