From: Olivier Goffart Date: Tue, 21 Aug 2018 08:45:27 +0000 (+0200) Subject: Fix test link with older Qt X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~519 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9c99544e0b98747e31c55fbe289d25714e52e18b;p=nextcloud-desktop.git Fix test link with older Qt --- 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;