mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1937 from ivaradi/xenial-compat

Browse Source 
Qt 5.5 compatibility #ifdef
This commit is contained in:
Dominique Fuchs 2020-04-25 12:23:25 +02:00 committed by GitHub
commit ddee26084d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libsync/syncengine.cpp
View File

@ -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