diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-26 16:57:44 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-26 16:57:44 +0200 |
| commit | d46b40d27ebc9bcbdb4430893396f066e1f2d758 (patch) | |
| tree | 28f269505091363139945284ec77dd2636a12290 /tests | |
| parent | 7ead994c8a3e263c4cced6f54f0d959d32268454 (diff) | |
| parent | 2269ddc60e47bfea459ef034ab1be112716b4764 (diff) | |
Merge 1.14 into master
Change-Id: Ic632b377bf10e2b320956011e9a7d4eea99f560b
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 6313827fa..aac0f3e7e 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -2652,7 +2652,7 @@ void TestApi::restoredWarnings() waitForFinished(job.get()); QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString())); job.reset(nullptr); - QCOMPARE(m_logSink->warnings.toSet().size(), 2); + QCOMPARE(toSet(m_logSink->warnings).size(), 2); const auto beforeErrors = m_logSink->warnings; for (const qbs::ErrorInfo &e : beforeErrors) { const QString msg = e.toString(); @@ -2667,7 +2667,7 @@ void TestApi::restoredWarnings() waitForFinished(job.get()); QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString())); job.reset(nullptr); - QCOMPARE(m_logSink->warnings.toSet().size(), 2); + QCOMPARE(toSet(m_logSink->warnings).size(), 2); m_logSink->warnings.clear(); // Re-resolving with changes: Errors come from the re-resolving, stored ones must be suppressed. @@ -2678,7 +2678,7 @@ void TestApi::restoredWarnings() waitForFinished(job.get()); QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString())); job.reset(nullptr); - QCOMPARE(m_logSink->warnings.toSet().size(), 3); // One more for the additional group + QCOMPARE(toSet(m_logSink->warnings).size(), 3); // One more for the additional group const auto afterErrors = m_logSink->warnings; for (const qbs::ErrorInfo &e : afterErrors) { const QString msg = e.toString(); |