Commit 93af8fbb authored by David Edmundson's avatar David Edmundson
Browse files

Fix failing unit test after a Qt backport

Marking a test as QEXPECT_FAIL and then passing results in the test
failing.

The relevant QtBase commit is 0cf41cf87a8d6fbf904a248ce75fd39ef073099c
which was in 5.15.2
parent 725fa094
......@@ -148,8 +148,8 @@ private Q_SLOTS:
// Check what's in QMimeDatabase
QStringList newPatterns = db.mimeTypeForName(QStringLiteral("text/plain")).globPatterns();
newPatterns.sort();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // adjust to 5.15 if the fix gets backported
QEXPECT_FAIL("", "QTBUG-85436 is only fixed in Qt 6.0", Continue);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 2)
QEXPECT_FAIL("", "QTBUG-85436 is only fixed in Qt 5.15.2", Continue);
#endif
QCOMPARE(newPatterns, patterns);
if (newPatterns == patterns) { // TODO Qt6: remove the if (keep the QVERIFY!)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment