diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-06 13:35:14 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-18 11:04:38 +1000 |
| commit | 39397733233b243c71d01aa74595ce7c2cc4e3f1 (patch) | |
| tree | 0771da856ee8c3c93e34d40e3fc7780e7087484c /tests | |
| parent | 10ea2f65241baf8f414ab9dc1c52d9fdb5103c68 (diff) | |
| download | qtxmlpatterns-39397733233b243c71d01aa74595ce7c2cc4e3f1.tar.gz | |
Remove Q_ASSERT from qabstractxmlnodemodel test
Constructing a model index from a null pointer will cause the test to
crash later. Instead of crashing this way in a release build and
aborting in a debug build, report the fatal error in all builds.
Change-Id: I43ce4c8fa48caa05aaf09ac3c1453d35a2de65bf
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 57fd8c5ac803398238982c4b74bc5ce048671201)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qabstractxmlnodemodel/LoadingModel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp index cf85486..63fad67 100644 --- a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp +++ b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp @@ -77,8 +77,8 @@ const LoadingModel::Node *LoadingModel::toInternal(const QXmlNodeModelIndex &ni) QXmlNodeModelIndex LoadingModel::createIndex(const Node *const internal) const { - Q_ASSERT_X(internal, Q_FUNC_INFO, - "We shouldn't construct from null pointers."); + if (!internal) + qFatal("%s: cannot construct a model index from a null pointer", Q_FUNC_INFO); return QAbstractXmlNodeModel::createIndex(const_cast<Node *>(internal)); } |