diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 00:58:00 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 00:58:00 +1000 |
| commit | cb2980a09aefcc207eacb500d5a3c74f064859dd (patch) | |
| tree | b119109514d04a7afa503ecd08a774483821c8d8 /tests/auto/qvariant | |
| parent | 4109badc4321effeeb798dd101479be7dffdbe3d (diff) | |
| parent | 5aa1cbcdacd19b2e526e358eddac1b7d55a994b5 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: (114 commits)
Fixed license header.
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Remove Q_ASSERT's from qsharedmemory autotest
Remove Q_ASSERT's from QNetworkReply autotest
Remove Q_ASSERT's from qabstractxmlnodemodel test
Remove Q_ASSERT from QXmlStream autotest
Remove Q_ASSERT from qxmlquery autotest
Remove Q_ASSERT's from QXmlStream autotest
Remove Q_ASSERT from QItemModel autotest
Remove Q_ASSERT's from qxmlquery autotest
Remove Q_ASSERT from qxmlquery autotest
Remove Q_ASSERT's from QXmlStream autotest
Remove Q_ASSERT from qabstractxmlnodemodel test
Remove Q_ASSERT from qscriptvaluegenerated test
Remove Q_ASSERT from QVariant autotest
Remove Q_ASSERT's from QTreeView autotest
Remove Q_ASSERT from qtesselator autotest
Remove unused function from qtessellator autotest
Remove Q_ASSERT from qscriptvaluegenerated test
Remove Q_ASSERT's from qscriptvaluegenerated test
...
Diffstat (limited to 'tests/auto/qvariant')
| -rw-r--r-- | tests/auto/qvariant/tst_qvariant.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 3e65d7e728..492d0dfc3d 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -3239,18 +3239,24 @@ struct MyData { void *ptr; MyData() : ptr(this) {} - ~MyData() { Q_ASSERT(ptr == this); } - MyData(const MyData& o) : ptr(this) { Q_ASSERT(o.ptr == &o); } + ~MyData() + { + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + } + MyData(const MyData& o) : ptr(this) + { + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); + } MyData &operator=(const MyData &o) { - Q_ASSERT(ptr == this); - Q_ASSERT(o.ptr == &o); + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); return *this; } bool operator==(const MyData &o) const { - Q_ASSERT(ptr == this); - Q_ASSERT(o.ptr == &o); + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); return true; } }; |