diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 03:00:24 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 03:00:24 +0200 |
commit | 928c75cb1ed4af22d292c44d2af19bce038ddd0d (patch) | |
tree | 9fcb43d5ad7b105c6f723ed56a3da914c21bbd6d /tests | |
parent | c515a2cab29c0c55d64a509850214869acdbb40c (diff) | |
parent | fc12d7056610895ef7c67004eaf521509208db40 (diff) | |
download | qtxmlpatterns-928c75cb1ed4af22d292c44d2af19bce038ddd0d.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id2b1cebbc86bad2780d964c896b4eb6c8188526f
Diffstat (limited to 'tests')
7 files changed, 8 insertions, 13 deletions
diff --git a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp index 55bcef9..ccd534a 100644 --- a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp +++ b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp @@ -362,7 +362,7 @@ void tst_QAbstractXmlNodeModel::typedValue() const return QVariant(); } - QXmlNodeModelIndex root() const + QXmlNodeModelIndex rootIndex() const { return createIndex(qint64(1)); } @@ -371,7 +371,7 @@ void tst_QAbstractXmlNodeModel::typedValue() const TypedModel model; QXmlQuery query; - query.bindVariable(QLatin1String("node"), model.root()); + query.bindVariable(QLatin1String("node"), model.rootIndex()); query.setQuery(QLatin1String("declare variable $node external;" "string($node), data($node)")); diff --git a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp index 73cc72b..66fe752 100644 --- a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp +++ b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp @@ -124,7 +124,7 @@ void tst_QSimpleXmlNodeModel::stringValue() const return QVariant(); } - QXmlNodeModelIndex root() const + QXmlNodeModelIndex rootIndex() const { return createIndex(qint64(1)); } @@ -134,7 +134,7 @@ void tst_QSimpleXmlNodeModel::stringValue() const TypedModel model(np); QXmlQuery query(np); - query.bindVariable(QLatin1String("node"), model.root()); + query.bindVariable(QLatin1String("node"), model.rootIndex()); query.setQuery(QLatin1String("declare variable $node external;" "string($node), data($node)")); diff --git a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp index c2e260d..0bef5bf 100644 --- a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp +++ b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp @@ -110,6 +110,7 @@ void tst_QXmlNodeModelIndex::copyConstructor() const { /* The extra paranthesis silences a warning on win32-msvc. */ const QXmlNodeModelIndex copy((QXmlNodeModelIndex())); + Q_UNUSED(copy) } } diff --git a/tests/auto/xmlpatternssdk/ResultThreader.cpp b/tests/auto/xmlpatternssdk/ResultThreader.cpp index 4a91d71..749a2dd 100644 --- a/tests/auto/xmlpatternssdk/ResultThreader.cpp +++ b/tests/auto/xmlpatternssdk/ResultThreader.cpp @@ -32,13 +32,11 @@ using namespace QPatternistSDK; -ResultThreader::ResultThreader(QEventLoop &ev, - QFile *file, +ResultThreader::ResultThreader(QFile *file, const Type t, QObject *p) : QThread(p) , m_file(file) , m_type(t) - , m_eventLoop(ev) { Q_ASSERT_X(p, Q_FUNC_INFO, "Should have a parent"); Q_ASSERT_X(file, Q_FUNC_INFO, "Should have a valid file"); diff --git a/tests/auto/xmlpatternssdk/ResultThreader.h b/tests/auto/xmlpatternssdk/ResultThreader.h index 22bde42..ee9438d 100644 --- a/tests/auto/xmlpatternssdk/ResultThreader.h +++ b/tests/auto/xmlpatternssdk/ResultThreader.h @@ -61,8 +61,7 @@ namespace QPatternistSDK /** * Creates a ResultThreader that will read @p file when run() is called. */ - ResultThreader(QEventLoop &ev, - QFile *file, + ResultThreader(QFile *file, const Type type, QObject *parent); @@ -83,7 +82,6 @@ namespace QPatternistSDK QFile *const m_file; const Type m_type; - QEventLoop & m_eventLoop; }; } diff --git a/tests/auto/xmlpatternssdk/Worker.cpp b/tests/auto/xmlpatternssdk/Worker.cpp index 03bce43..01529d6 100644 --- a/tests/auto/xmlpatternssdk/Worker.cpp +++ b/tests/auto/xmlpatternssdk/Worker.cpp @@ -109,9 +109,7 @@ void Worker::threadFinished() deleteLater(); ResultThreader::Hash::const_iterator itA(m_result.constBegin()); - ResultThreader::Hash::const_iterator itB(m_baseline.constBegin()); const ResultThreader::Hash::const_iterator endA(m_result.constEnd()); - const ResultThreader::Hash::const_iterator endB(m_baseline.constEnd()); const int baselineCount = m_baseline.count(); const int resultCount = m_result.count(); diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp index 639a71e..832d842 100644 --- a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp +++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp @@ -144,7 +144,7 @@ void tst_SuiteTest::checkTestSuiteResult() const QVERIFY2(file->open(QIODevice::ReadOnly), qPrintable(QString::fromLatin1("Could not open file %1 for reading.") .arg(i.fileName()))); - ResultThreader *handler = new ResultThreader(eventLoop, file, type, worker.data()); + ResultThreader *handler = new ResultThreader(file, type, worker.data()); QObject::connect(handler, SIGNAL(finished()), worker.data(), SLOT(threadFinished())); |