Dominique Fuchs
8ee1adf058
Fixed another logic error -> logical to bitwise OR for QTLEGACY
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit f41eeaf6ec
2019-10-17 19:34:18 +02:00
Dominique Fuchs
27fb1fcd53
Fixed logic error in QTLEGACY macro and added forgottin #if clause for header file
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 48097801e8
2019-10-17 19:34:18 +02:00
Dominique Fuchs
29cc5c1e7f
Added macro definition and compile-time condition to support Qt < 5.9
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit dca83aad45
2019-10-17 19:34:18 +02:00
Dominique Fuchs
29bb76019f
Indeed, DWORD is a special snowflake - only when on _WIN32
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit be7a524557
2019-10-17 19:34:18 +02: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
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
2019-10-17 19:34:17 +02:00
Dominique Fuchs
c723028eae
Qt: Fixed numerous deprecated calls by adapting newer ones
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit a2d47cdec4
2019-10-17 19:34:17 +02:00
Dominique Fuchs
5d024fdf33
Added cmake preprocessor definitions when using msvc regarding the 'safe' versions of CRT functions
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit ba74c24d8f
2019-10-17 19:34:17 +02:00
Dominique Fuchs
ed99cb297b
Use existing fct for RegKeyQuery instead of redundant subroutine
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit d60a216982
2019-10-17 19:34:17 +02:00
Dominique Fuchs
a0e794a7f1
Numoerous safe conversions implemented. Added additional Utility::convertSizeToDWORD for windows builds.
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit d6af025a46
2019-10-17 19:34:16 +02:00
Dominique Fuchs
0761342840
Corrected namespace when calling convertSizetoUint
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 82fa10c227
2019-10-17 19:34:16 +02:00
Dominique Fuchs
4da9123b67
Renamed conversion function to make intention more clear. Also defaulted to 'controlled truncation' to not stupidly crash. TBD/TODO: Better handling for such things.
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 46e0a05078
2019-10-17 19:34:16 +02:00
Dominique Fuchs
c7158e2c7c
Selectively and temporary disabled warning about unknown preprocessor declarative for msvc when using specific GCC instruction.
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 8329de4cee
2019-10-17 19:34:16 +02:00
Dominique Fuchs
4adc45483a
Implemented Utility::convert function to convert size_t -> uint safely and on the fly. Often necessary for Qt and WIN32 functions. Using this will not generate compiler warnings of possible truncation. First call implemented in ownsql.cpp
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit b4dee67bf5
2019-10-17 19:34:16 +02:00
Dominique Fuchs
ae0ff6b3e3
Fixed broken overloading mechanism of variadic templates. See code comment for further information.
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 5ae3435fe6
2019-10-17 19:34:16 +02:00
Dominique Fuchs
dc6d2e6a6d
usage of UINT as iterator here because comparing with UINT retval from DragQueryFile
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 9a256fcbfe
2019-10-17 19:34:15 +02:00
Dominique Fuchs
5127f50d1e
Removed redundant (and wrong in terms of it's value) definitions for WINVER/_WIN32_WINNT
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 112d2bfe11
2019-10-17 19:34:15 +02:00
Dominique Fuchs
a26f2a7359
Removed redundant (and wrong in terms of it's value) definitions for WINVER/_WIN32_WINNT
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 69a11a7ec1
2019-10-17 19:34:15 +02:00
Dominique Fuchs
42f1f445a9
Removed redundant (and wrong in terms of it's value) definitions for WINVER/_WIN32_WINNT
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 3960ffea3f
2019-10-17 19:34:15 +02:00
Dominique Fuchs
51304485c3
Updated WINVER/_WIN32_WINNT from 0x0600 to 0x0601 (e.g. Server 2008/Vista to 7) as 7 is reasonable and noted everywhere as requirement
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 78543deee4
2019-10-17 19:34:12 +02:00
Björn Bidar
63cc6edddd
fix qt warning about registering a URL sheme first.
...
Qt recommends to register a URL scheme before installing it.
I don't know the impact of the not registering before instaling but I
think the change is pretty harmles.
See:
https://doc.qt.io/qt-5/qwebengineurlscheme.html#registerScheme
Signed-off-by: Björn Bidar <theodorstormgrade@gmail.com>
(cherry picked from commit cea0d519a4
2019-10-17 18:08:39 +02:00
Dominique Fuchs
58abebe9ac
Fixed e2e key transmission issue after generation (forgotten content type on sendrequest())
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit a35b346e62
2019-10-17 17:33:41 +02:00
Michael Schuster
1182ae9e26
Merge pull request #1515 from nextcloud/qt5-mac-5.12-prepare
...
Add new "styles" plugin to macOS deployment script for Qt 5.12.5
2019-10-15 23:58:26 +02:00
Michael Schuster
3407174c2f
Add new "styles" plugin to macOS deployment script for Qt 5.12.5
...
Qt 5.12 needs this library to use the correct style for Light / Dark Mode:
styles/libqmacstyle.dylib
The interface looks like from the 1990's without this library ;-)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-14 02:01:56 +02:00
Michael Schuster
913894eaa5
Merge pull request #1496 from nextcloud/backport/1495/stable-2.6
...
[stable-2.6] Add a 'Content-Length: 0' header to initial POST requests
2019-10-10 08:11:43 +02:00
Michael Schuster
db91552578
Add a 'Content-Length: 0' header to initial POST requests
...
The webserver lighttpd rejected POST requests without a Content-length
header with "411 Length Required".
See: https://github.com/nextcloud/desktop/issues/1473
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-10 06:09:59 +00:00
Camila San
286e45bafe
Bump version to 2.6.0
...
Signed-off-by: Camila San <hello@camila.codes>
(cherry picked from commit e0b32c19e4
2019-10-05 15:13:59 +02:00
Michael Schuster
aa1bb470e6
fix comment typo
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit 905c1532fe
2019-10-05 14:56:48 +02:00
Michael Schuster
3be9adde4b
Fix double slashes in WebDAV URLs (account setup wizard)
...
Sanitize URL paths to elaminate double-slashes in the URL path string,
used for the first connection by the account setup wizard.
Example: https://cloud.example.com/remote.php/webdav//
Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit 67107a4f5d
2019-10-05 14:56:15 +02:00
István Váradi
41d97abd08
Merge pull request #1475 from ivaradi/stable-2.6
...
Remove kdelibs5-dev from the build dependencies for Eoan
2019-10-05 09:33:00 +02:00
István Váradi
6bc232c9b4
Remove kdelibs5-dev from the build dependencies for Eoan
...
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-10-05 09:31:55 +02:00
István Váradi
d4a0be92ae
Merge pull request #1466 from ivaradi/stable-2.6.0
...
Trigger builds for tagging on the 2.6.0 branch
2019-10-04 20:19:38 +02:00
István Váradi
75bf41fba1
Trigger builds for tagging on the 2.6.0 branch
...
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-10-02 19:18:13 +02:00
Camila San
a2bfd5039c
Revert "Fix White Window issue on Windows after Qt 5.12.4 upgrade"
...
This reverts commit aeba2e4de6
2019-09-27 15:04:14 +02:00
Camila San
a9ee7472b9
Improve wording of the context menu in the file manager extension.
...
'Share...' -> 'Share options'
'private link' -> 'internal link'
Removes 'to clipboard' from 'copy link' options.
Signed-off-by: Camila San <hello@camila.codes>
2019-09-26 13:24:10 +02:00
Michael Schuster
211d6cb162
UI improvement: Message box: Delete / Keep all files
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-26 12:05:34 +02:00
Mariusz Wasak
501c353291
Fix for #1382 "linux client crashes for no discernable reason"
...
There in no "return" in
PropagateUploadFileCommon::slotStartUpload in if (prevModtime != _item-
>_modtime) {... }
There is possibility that
PropagateItemJob::done(status, errorString)
maybe called two times from PropagateUploadFileCommon::slotStartUpload
1. in if (prevModtime != _item->_modtime) {... }
2. in if (fileIsStillChanging(*_item)) {..}
if changes in files are frequent the second call is possible.
This two calls has effect in PropagatorCompositeJob::slotSubJobFinished
and job is removed two times in _runningJobs.remove(i);
(the second time with argumetnt -1 (because first call removed job).
This return was removed in commit
efc039863b
2019-09-26 12:03:20 +02:00
Michael Schuster
aeba2e4de6
Fix White Window issue on Windows after Qt 5.12.4 upgrade
...
Qt 5.12.4 seems to introduce a new bug on Windows, causing the settings window
to not be redrawn when re-opening it, for example by clicking at the tray icon.
As a workaround this fix starts a 100 ms timer to be fired once upon
QDialog::showEvent is called.
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-26 11:29:49 +02:00
Camila Ayres
2f9f84c1f2
Merge pull request #1447 from nextcloud/backport/1438/stable-2.6
...
[stable-2.6] Changes wording in the share context menu.
2019-09-26 11:16:17 +02:00
Camila San
33646b1775
Changes wording in the share context menu.
...
Instead of only Nextcloud it says "Share via Nextcloud".
Signed-off-by: Camila San <hello@camila.codes>
2019-09-26 09:12:28 +00:00
Camila Ayres
acb9fc7c8e
Merge pull request #1408 from nextcloud/flow2-ui-qt5-compat
...
Qt5.5 compatiblity patch for login flow V2 + UI improvement
2019-09-06 17:56:09 +02:00
Camila Ayres
081f9741e4
Merge branch 'master' into flow2-ui-qt5-compat
2019-09-06 17:32:40 +02:00
Camila Ayres
a70b7d5852
Merge pull request #1405 from DominiqueFuchs/w10-start-logo
...
Full-Scaled new logo in Windows 10 start menu tile
2019-09-06 17:22:10 +02:00
Michael Schuster
8b2c47cdcb
Remove old Qt 5.5 patch for Xenial
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-06 17:05:18 +02:00
Camila Ayres
a3beb9ba41
Merge branch 'master' into w10-start-logo
2019-09-06 17:02:06 +02:00
Camila Ayres
c4dfe576d0
Merge pull request #1399 from DominiqueFuchs/master
...
Integrated registry check on windows when hasDarkSystray is called.
2019-09-06 17:01:53 +02:00
Camila Ayres
0841fe8dd3
Merge branch 'master' into master
2019-09-06 16:50:27 +02:00
Camila Ayres
c3b270ba26
Merge pull request #1401 from DominiqueFuchs/logo-update
...
Logo update
2019-09-06 16:37:59 +02:00
Camila Ayres
9ab5241459
Merge branch 'master' into w10-start-logo
2019-09-06 16:03:54 +02:00
Camila Ayres
ec603b061d
Merge branch 'master' into logo-update
2019-09-06 15:42:02 +02:00
