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:
0514fdd
)
Qt 5.5 compatibility #ifdef
author
István Váradi
<ivaradi@varadiistvan.hu>
Sun, 19 Apr 2020 15:11:38 +0000
(17:11 +0200)
committer
István Váradi
<ivaradi@varadiistvan.hu>
Thu, 23 Apr 2020 18:22:30 +0000
(20:22 +0200)
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
src/libsync/syncengine.cpp
patch
|
blob
|
history
diff --git
a/src/libsync/syncengine.cpp
b/src/libsync/syncengine.cpp
index 63626c30ad15f5a657f9512f736f9ce4202bc5ce..91be03ebb8612cc33514f45f26dca92d123f5bab 100644
(file)
--- a/
src/libsync/syncengine.cpp
+++ b/
src/libsync/syncengine.cpp
@@
-326,6
+326,11
@@
void SyncEngine::deleteStaleErrorBlacklistEntries(const SyncFileItemVector &sync
_journal->deleteStaleErrorBlacklistEntries(blacklist_file_paths);
}
+#if (QT_VERSION < 0x050600)
+template <typename T>
+constexpr typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; }
+#endif
+
void SyncEngine::conflictRecordMaintenance()
{
// Remove stale conflict entries from the database