From 9c99544e0b98747e31c55fbe289d25714e52e18b Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 21 Aug 2018 10:45:27 +0200 Subject: [PATCH] Fix test link with older Qt --- test/testsyncconflict.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testsyncconflict.cpp b/test/testsyncconflict.cpp index ffdd20cac..635fd7d56 100644 --- a/test/testsyncconflict.cpp +++ b/test/testsyncconflict.cpp @@ -225,7 +225,7 @@ private slots: auto conflictRecord = fakeFolder.syncJournal().conflictRecord("A/a1 (conflicted copy 1234)"); QVERIFY(conflictRecord.isValid()); QCOMPARE(conflictRecord.baseFileId, fakeFolder.remoteModifier().find("A/a1")->fileId); - QCOMPARE(conflictRecord.basePath, "A/a1"); + QCOMPARE(conflictRecord.basePath, QByteArray("A/a1")); // Now with server headers QObject parent;