chylex
/
Nextcloud-Desktop
mirror of https://github.com/chylex/Nextcloud-Desktop.git
1
0
Fork 0
Code
13,625 Commits 4 Branches 173 Tags 91 MiB
Commit Graph

306 Commits

Author SHA1 Message Date
Michael Schuster 30832cc427
MSVC Fix for PR #1526: Fix clang's variadic macro warnings 
The recently merged #1526 caused the MSVC Builds on Windows to fail.

This patch sets the new CMake flag only if the compiler it not MSVC.

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit a12164ad53)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-12-05 20:21:13 +01:00
Johannes Lorenz ab7f29c0b2
Fix clang's variadic macro warnings 
Using variadic macros like `qCWarning()` without any parameter for "..."
is a GNU extension, which causes a lot of `clang` warnings:

```
desktop/src/common/ownsql.cpp:74:24: warning: must specify at least one
 argument for '...' parameter of variadic macro
 [-Wgnu-zero-variadic-macro-arguments]
        qCWarning(lcSql) << "Error:" << _error << "for" << filename;
                       ^
/usr/include/qt/QtCore/qloggingcategory.h:140:11: note: macro 'qCWarning'
 defined here
          ^
```

This patch tells `clang` to be silent.

Signed-off-by: Johannes Lorenz <j.git@lorenz-ho.me>
(cherry picked from commit 8c334a1f43)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-12-05 20:20:56 +01:00
Dominique Fuchs bf6d57f327
Fixed wrongly formatted args for win32 linker flags resulting in 'unrecognized option' for all of them. Remark: /WL is for VS only, useless (and not necessary for msvc cmd) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 0827ff0995)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:17 +02:00
Dominique Fuchs eb5ec05ef8
Fixed missing braces 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 503b9de2a0)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:17 +02:00
Roeland Jago Douma c4a88fe57e
Add QWebView as a dependency 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Tomaz Canabrava d24a1e542e Merge branch 'master' into clientSideEncryptionV3 2018-01-29 14:06:12 +01:00
Dominik Schmidt 7839c4d4e1 Revert "Disable stack protection for mingw win32 builds in 2.4" 
This reverts commit 298f1ab570.

We're shipping libssp-0.dll now with mingw builds. We would
have enough time to test this for 2.5.0 now anyway, but we
also will most likely switch to MSVC for that release.
 2018-01-14 14:39:29 +01:00
Olivier Goffart 257d8142b1 Build system: Get rid of QtVersionAbstraction.cmake 
Use modern cmake with target_link_libraries and Qt5:: that
automatically add the include path and compile flags
 2018-01-13 13:58:17 +01:00
Hefee 69e81e8f65 Also disable fstack-protector for alpha plattform. 
This fixes #6211.
 2017-12-16 14:03:59 +01:00
Christian Kamm 298f1ab570 Disable stack protection for mingw win32 builds in 2.4 
Mingw builds could have it enabled! But we need to ship libssp and test
this more. For the upcoming 2.4 release it should be disabled.
 2017-12-15 09:16:59 +01:00
Roeland Jago Douma 56028759d5
Merge branch 'master' into clientSideEncryptionV3 2017-12-14 20:47:05 +01:00
rockihack 5cc3b526e8 stack-protector is not supported on hppa. 
(cherry picked from commit 8a963a67f2)
 2017-12-13 11:28:22 +01:00
rockihack 1b2a8ba6b0 Enable stack-protector-strong on Windows and macOS. 
(cherry picked from commit 586fd346ea)
 2017-12-13 11:28:22 +01:00
rockihack 8a963a67f2 stack-protector is not supported on hppa. 2017-12-13 11:27:48 +01:00
rockihack 586fd346ea Enable stack-protector-strong on Windows and macOS. 2017-12-13 11:27:48 +01:00
Tomaz Canabrava 33b1fcfe66 Merge branch 'master' into clientSideEncryptionV3 2017-12-12 10:46:43 +01:00
Markus Goetz 0479322c1d fstack-protector: Improve previous commit 2017-12-04 12:37:03 +01:00
Klaas Freitag 0be7b6fe1f Only enable -fstack-protector-strong compiler flag for gcc > 4.9 
On older/other compilers this flag is not understood.
 2017-12-04 12:37:03 +01:00
Tomaz Canabrava c695c50c33 [CSE] Implement the empty metadata 
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
 2017-10-30 15:40:05 +01:00
rockihack 2bfd85e3c7
Linux Hardening 
see: https://wiki.debian.org/Hardening#User_Space
 2017-10-05 22:01:38 +02:00
rockihack 4e90179065
Enable DEP & ASLR on Windows 2017-10-05 22:01:04 +02:00
Jocelyn Turcotte f897a91354
Move csync to src/csync 2017-10-05 22:01:03 +02:00
rockihack ecaa37efbe Linux Hardening 
see: https://wiki.debian.org/Hardening#User_Space
 2017-09-29 14:34:30 +02:00
rockihack 6f270a3648 Enable DEP & ASLR on Windows 2017-09-11 11:18:18 +02:00
Jocelyn Turcotte 28a0971cdf Move csync to src/csync 2017-08-22 11:18:22 +02:00
Olivier Goffart acf65b4c23 csync: Use Qt for encodeing/decoding filesystem strings 
Issues:
 - #5661   On mac, iconv did not support all of unicode and some
           files with emoji in the filename could not be uploaded

 - #5719 , #5676  On linux, we will now support non utf-8 locale
 2017-07-13 10:01:17 +02:00
Olivier Goffart 9aeb587d6c Require Qt5 2017-04-20 09:39:41 +02:00
Jocelyn Turcotte b26db062d2 Fix the UNIT_TESTING build on Windows 
- Put all tests in the bin directory so that DLLs can be loaded
- Add missing exports
- Skip tests that use code depending on zlib
- The "GMT" timezone is named differently, use the int constructor instead

5 tests are still failing, it's not really worth fixing at the moment
since no developper is currently using Windows as its main platform.
 2017-02-14 14:32:41 +01:00
Olivier Goffart fdcdddca16 CMakeLists: move QtKeychain detection in client 2016-04-12 14:43:26 +02:00
Olivier Goffart f8dc263338 CMakeLists: fix Qt4 build 
Only the src subdirectory needs Qt.
Otherwise it activates Qt4 also for the dolphin plugin which always need Qt5
 2016-04-11 15:49:18 +02:00
Daniel Molkentin 1d8c919645 Force linkage against libc++ 2015-07-02 13:31:25 +02:00
Daniel Molkentin cdac8d56d5 Merge remote-tracking branch 'origin/master' into crashreporter 
Conflicts:
	src/libsync/utility.cpp
	src/libsync/utility.h
 2014-11-11 23:53:38 +01:00
Olivier Goffart ba2c33af0b Fix the il branch merge: Move the bandwidthmanager to libsync 2014-11-08 10:52:14 +01:00
Olivier Goffart de11f602d5 Merge remote-tracking branch 'origin/il' 
Conflicts:
	csync/src/csync_private.h
	src/CMakeLists.txt
	src/gui/folder.cpp
	src/libsync/owncloudpropagator.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagator_qnam.cpp
	src/libsync/propagator_qnam.h
	src/libsync/syncengine.cpp
	src/libsync/syncengine.h
	src/mirall/syncjournaldb.cpp
 2014-11-08 10:48:36 +01:00
Markus Goetz de79f9338a Propagator: Bandwidth limiting for new propagator 2014-10-07 14:46:55 +02:00
Dominik Schmidt 2b4849a2fa Add crash reporter using libcrashreporter-qt 2014-08-26 18:15:13 +02:00
Daniel Molkentin e5471d8318 Build after merge 2014-08-26 14:33:21 +02:00
Daniel Molkentin 902bb7a198 Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 
Conflicts:
	src/CMakeLists.txt
	src/gui/accountsettings.cpp
	src/gui/folderwizard.cpp
	src/gui/settingsdialog.cpp
	src/libsync/syncengine.h
 2014-08-26 11:29:42 +02:00
Olivier Goffart 4b2c1bacd1 Merge remote-tracking branch 'origin/master' into selective_sync 2014-08-15 10:28:50 +02:00
Daniel Molkentin 1544606bf0 Always handle 401 requests, except for network jobs 
It is not enough to only implement it for the QNAM returned
by the ShibbolethCredentials, because we sometimes need it
when we have no valid credentials set (and are using dummy
credentials in the course).  The main use case is the
Webview opened by Shibboleth for FBA.

But as a side-effect, we can use it to handle auth requests
from the updater and other places.
 2014-08-12 19:25:59 +02:00
Markus Goetz faa502163e OS X: Finally(?) fix stay-on-top behaviour of settings dialog 
Fixes #1795
 2014-08-12 14:48:42 +02:00
Olivier Goffart 1f1eb933d1 Move the update job in a new file named discoveryphase 
"Discovery" is a better name than "update"
 2014-08-11 18:42:24 +02:00
Olivier Goffart aa85e875bd Selective sync: Add UI to select paths 2014-08-11 18:42:24 +02:00
Markus Goetz 1bc8fd9b49 CMake: Don't need translations with token auth compile 2014-08-08 11:59:14 +02:00
Daniel Molkentin 28879712e9 Make krazy target work again 2014-07-14 12:19:32 +02:00
Daniel Molkentin 5041880854 Try to handle BUILD_LIBRARIES_ONLY correctly 
Also, try to fix OS X build
 2014-07-11 12:36:01 +02:00
Daniel Molkentin df3c3bca02 Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
Daniel Molkentin d1b991e198 Fix windows compilation 2014-07-10 22:58:58 +02:00
Klaas Freitag 00f793a841 CMake: Remove accidentially added typo to fix build. 2014-07-10 17:20:40 +02:00
Klaas Freitag c6deb392fd SocketAPI: Enhance SyncFileStatus to have share information. 
Added a new class SyncFileStatus to reflect that properly.
 2014-07-10 16:28:40 +02:00