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

323 Commits

Author SHA1 Message Date
Nicolas Fella 72277726a3 Remove unneeded include_directories 
Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-09-01 11:43:03 +00:00
Felix Weilbach 332a48e6a1 Update to Qt 5.15 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-08-19 14:01:46 +02:00
Nicolas Fella 43cccb0a73 Don't use variables for CMake target identifiers 
This makes the code a bit nicer to read and maybe a bit more robust.

Set the relevant OUTPUT_NAME target properties to keep the ability to
customize the names of the installed binaries.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-08-19 10:30:23 +00:00
Felix Weilbach 40065dc6dc Disable QtWebEngine automatic if not found 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-06-24 15:43:51 +00:00
Felix Weilbach 8376b99ec5 Allow to compile without QWebEngine 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-06-24 15:43:51 +00:00
Felix Weilbach e2d0481c64 Add CMake option to enable address sanitizers 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-05-17 11:43:55 +00:00
yopito 14d61c5071 clang's variadic macro warnings: only for clang 
following settings of cmake/modules/Warnings.cmake

Signed-off-by: yopito <pierre.bourgin@free.fr>
 2021-04-26 13:22:41 +00:00
Hannah von Reth 7e91166d7a
CMake: Remove krazy2 support, we now use clazy 2020-12-15 10:59:13 +01:00
Christian Kamm 1cc41427fc
Build fix for mingw64 7.3 (Qt 5.12.0) 2020-12-15 10:58:37 +01:00
Christian Kamm 2b20985875
winvfs: initial work 
Done by ckamm and dschmidt
 2020-12-15 10:58:21 +01:00
Gerhard Gappmeier ff9bd84c45
Disable stack protector features when cross compiling 
When cross-compiling this for remarkable using the poky toolchain
this results in linker errors with stack protector: libssp_nonshared.a
not found
 2020-12-15 10:58:18 +01:00
Gerhard Gappmeier 6aead6425e
Add CMake option to disable GUI build 2020-12-15 10:58:18 +01:00
Markus Goetz 811ac50c05
CMakeLists.txt: Log the Qt version in compile 2020-12-15 10:58:05 +01:00
Michael Schuster e02be629bb Windows: Enable CFG and SafeSEH linker security flags 
See:
https://docs.microsoft.com/en-us/windows/win32/secbp/control-flow-guard
https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-08-03 10:11:33 +02:00
Michael Schuster e6389959ce macOS: Build nextcloudcmd after gui and run macdeployqt with the -executable option 
- src/CMakeLists.txt: Switch build order to build cmd before gui
- src/gui/CMakeLists.txt: Use the -executable option for a combined run of macdeployqt

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-06-07 14:39:42 +02:00
Kevin Ottens 3867e73fd5 Stop supporting Qt older than 5.12 
This both removes older Qt from the CI and also adjust all the
find_package calls in CMakeLists.txt

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-14 21:15:45 +02:00
Dominique Fuchs 3a39e636ae Introduced Style module 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-19 20:13:12 +01:00
Michael Schuster a12164ad53
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>
 2019-10-20 12:52:52 +02:00
Johannes Lorenz 8c334a1f43 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>
 2019-10-18 05:25:05 +02:00
Dominique Fuchs 0827ff0995 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>
 2019-09-08 16:09:58 +02:00
Dominique Fuchs 503b9de2a0 Fixed missing braces 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-08 15:49:53 +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