diff options
Diffstat (limited to 'deskutils/owncloudclient/files')
3 files changed, 9 insertions, 19 deletions
diff --git a/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp b/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp index f9e0d7f0fd37..cfc75c1b3b1a 100644 --- a/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp +++ b/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp @@ -1,8 +1,8 @@ ---- src/gui/owncloudgui.cpp.orig 2017-12-20 15:03:02 UTC +--- src/gui/owncloudgui.cpp.orig 2020-12-21 16:16:36 UTC +++ src/gui/owncloudgui.cpp -@@ -35,6 +35,8 @@ - #include "common/syncjournalfilerecord.h" +@@ -32,6 +32,8 @@ #include "creds/abstractcredentials.h" + #include "guiutility.h" +#include <climits> + diff --git a/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp b/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp index 09f5dc7f7598..bf8733f5e592 100644 --- a/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp +++ b/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp @@ -1,17 +1,17 @@ ---- src/libsync/configfile.cpp.orig 2017-12-20 15:03:02 UTC +--- src/libsync/configfile.cpp.orig 2020-12-21 16:16:36 UTC +++ src/libsync/configfile.cpp -@@ -448,11 +448,22 @@ bool ConfigFile::skipUpdateCheck(const QString &connec +@@ -526,11 +526,22 @@ bool ConfigFile::skipUpdateCheck(const QString &connec if (connection.isEmpty()) con = defaultConnection(); +#if 0 - QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false); + QVariant fallback = getValue(skipUpdateCheckC(), con, false); +#else -+ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true); ++ QVariant fallback = getValue(skipUpdateCheckC(), con, true); +#endif - fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback); + fallback = getValue(skipUpdateCheckC(), QString(), fallback); - QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback); + QVariant value = getPolicySetting(skipUpdateCheckC(), fallback); +#if 0 return value.toBool(); +#else diff --git a/deskutils/owncloudclient/files/patch-src_libsync_networkjobs.cpp b/deskutils/owncloudclient/files/patch-src_libsync_networkjobs.cpp deleted file mode 100644 index 7b3f3aa33221..000000000000 --- a/deskutils/owncloudclient/files/patch-src_libsync_networkjobs.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/libsync/networkjobs.cpp.orig 2020-05-30 08:02:56 UTC -+++ src/libsync/networkjobs.cpp -@@ -31,6 +31,7 @@ - #include <QJsonObject> - #ifndef TOKEN_AUTH_ONLY - #include <QPainter> -+#include <QPainterPath> - #endif - - #include "networkjobs.h" |