diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-07-08 09:16:39 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-08 01:25:33 +0200 |
| commit | 859fce3c46278e15372af31570c363554443ed32 (patch) | |
| tree | 4616ddcf2e94f8e00662eaa4ac051903f8491b5a /tests | |
| parent | 558451b898a30955fae0486b9e474c9ce6b6fe03 (diff) | |
| download | qtxmlpatterns-859fce3c46278e15372af31570c363554443ed32.tar.gz | |
Fixed compile of qtxmlpatterns against latest qtbase (`qs' macro)
ee85e9cc10bc6874c892b09fa54b5dbd79854069 adds a macro qs(str), which
breaks some code already using `qs' as a variable name.
Change-Id: I92ee0f77499a5c815a940f719febee9d01b843cb
Reviewed-on: http://codereview.qt.nokia.com/1331
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qxmlquery/tst_qxmlquery.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index eb372f7..024301e 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -994,14 +994,12 @@ void tst_QXmlQuery::evaluateToReceiver_data() const { QTest::addColumn<QString>("inputQuery"); - const QStringList qs(queries()); - - for(int i = 0; i < qs.size(); ++i) + foreach (QString const& query, queries()) { /* This outputs a URI specific to the environment, so we can't use it for this * particular test. */ - if(qs.at(i) != QLatin1String("staticBaseURI.xq")) - QTest::newRow(qs.at(i).toUtf8().constData()) << qs.at(i); + if (query != QLatin1String("staticBaseURI.xq")) + QTest::newRow(query.toUtf8().constData()) << query; } } |