projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3f745f
)
Fix test link with older Qt
author
Olivier Goffart
<ogoffart@woboq.com>
Tue, 21 Aug 2018 08:45:27 +0000
(10:45 +0200)
committer
Kevin Ottens
<kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:58:04 +0000
(10:58 +0100)
test/testsyncconflict.cpp
patch
|
blob
|
history
diff --git
a/test/testsyncconflict.cpp
b/test/testsyncconflict.cpp
index ffdd20cacf66cedc9c500c52817af8af4e80bfae..635fd7d56c44938c022f4f87874857d0574c5dd2 100644
(file)
--- 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;