mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 13:05:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
21165 commits 472 branches 255 tags 509 MiB
Commit graph

21165 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthieu Gallien
810d8f15ee
Merge pull request #4584 from nextcloud/feature/qt6 
Migrate to Qt 6
 2024-04-26 09:05:38 +02:00
Matthieu Gallien
3770eec050 windows needs an explicit QML import path to be set 
on windows qml modules are not default loaded from the install folder of the app

set it such that qml modules are imported from teh installed qml folder

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
07c2554eb3 AppImage build tool for Qt needs to know our qml files 
gives the path to qml files such that needed Qt qml modules are deployed
correctly inside the AppImage package

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
347285b5b3 fix build issue after rebase 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
5bed41a670 use the correct Qt6 build in newer CI images 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
794db304f9 fix compilation of AppImage packages 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
2d5753c17d make it easy to find out that this branch is Qt6 based 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
a357570633 fix compilation after rebase 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
bebb8e1954 fix compilation issues on windows 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
20db6b6d86 fully qualify types for use with Qt metaobject system 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
1533670e77 add NextcloudSslCertificate to wrap QSslCertificate in QHash 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
a05ac621bf do some header includes clean-up as recommended by compiler 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
9b9ff4f471 add needed namespace for declarations read by Qt metaobject system 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
3099628770 header changes needed for clang/vs2022 compilers 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
82a0c1d054 NetrcParser tests are known to be broken 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
7d132029a2 use new qt 6.6.3 ci images 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
060181f83d fix some of the qml issues 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
aae9e84438 fix compilation issues after rebase 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
tobiasKaminsky
8ad2a82ea9 Signed drone.yml 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
4f178fa9be fix order of init in a constructor to avoid warnings 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
3ad7ac922a avoid warning by ignoring the return value of QtConcurrent::run 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
910d7f03e8 when loading translation catalog, do not ignore the return value 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
7432fb4980 adapt ci checks to Qt6 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
430d56e72e build image for Qt6 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
ced6d3274c build appimage 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
332f069491 use the new CI images with Qt6 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
b7bba50672 let appimage build script work with Qt6 based version 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
44f6d514ff only try to include qt6-keychain header and not the qt5 version 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
032af80d4d fix computation of timeout for jobs to have proper bounds (min < max) 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
09e60744c2 e proper data type in data for activity model automated test data 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
fa766c02ac properly use QStringView to avoid copies 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
670b2ce42f fix automated tests missing toString() convert from QVariant 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
274d866c19 fix failing automated test that erases invalid iterator 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
ced85ac287 fix automated tests with network requests 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Matthieu Gallien
e3456847d8 last step 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
70931fb0af Remove commented out broken quick compiler check in Qt6 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
5d765dd017 Fix user status selector 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
3765df627b Fix test compilation 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
3597766fb0 Add separators to SyncStatus and UnifiedSearchInputContainer to stop the scrollviews looking broken 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
52758a00b8 Fix QML coloring issues 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
5087d5142a Fix all broken QML imports 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
7e62368eb2 Fix QDateTime string formatting 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
c31e65c111 Remove crashing QRandomGenerator seed call 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
a0e90cf56b Remove use of QCoreApplication AA attributes 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
a8e7e340aa Replace use of staticQtMetaObject with staticMetaObject 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
aaea45110f Replace removed progress bar option orientation with state flag 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
7a17a51a25 Use QEnterEvent for new enterEvent parameters 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
7e1448bcf2 Remove use of qRegisterMetatypeStreamOperators 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
84414ce5dc Replace deleted '+' operator for flags with '|' operator 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00
Claudio Cambra
6210490109 Replace now invalid '+' operator with '|' operator for QKeySequence 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-04-26 09:05:12 +02:00