aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-05-04 12:54:10 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-18 10:59:11 +1000
commit939ef5eb383c43122d7ea44ab58c2f8b62461e39 (patch)
treec0f8ae7f390d56b679a2f33c165827e018dd81f5
parentd0d61b454a04ee6f3497385faa0f0dc6c6ceace1 (diff)
Remove Q_ASSERT from qdeclarativexmllistmodel test
Report a meaningful warning in all builds rather than aborting in debug builds and doing nothing in release builds. Change-Id: I14aa7bc8699f5307e1ec34b18006b9fbbd8aca8e Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 1ea84cba1f90a9c95c54480117342dba0eae3d2f)
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index a0e254773b..c4f4058753 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -126,7 +126,10 @@ private:
QStringList fields = item.split(",");
foreach(const QString &field, fields) {
QStringList values = field.split("=");
- Q_ASSERT(values.count() == 2);
+ if (values.count() != 2) {
+ qWarning() << "makeItemXmlAndData: invalid field:" << field;
+ continue;
+ }
xml += QString("<%1>%2</%1>").arg(values[0], values[1]);
if (!modelData)
continue;