Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate to Qt 6 #4584

Merged
merged 71 commits into from
Apr 26, 2024
Merged

Migrate to Qt 6 #4584

merged 71 commits into from
Apr 26, 2024

Conversation

mgallien
Copy link
Collaborator

@mgallien mgallien commented May 20, 2022 •
edited by claucambra
Loading

Fix #4461

Signed-off-by: Matthieu Gallien [email protected]

Edit (clau):

Todo:

  • Remove cherry-picked b48f714 73946f4 b5de9d2 153176c 16e1d9a once merged in master
  • Fix visual bugs in user status selector
  • Fix scrolling in emoji picker
  • Fix tests
  • Fix user status selector

@sonarcloud
Copy link

sonarcloud bot commented May 22, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell B 12 Code Smells

7.9% 7.9% Coverage
0.0% 0.0% Duplication

claucambra
claucambra reviewed May 23, 2022
View reviewed changes
Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small comment

src/gui/CMakeLists.txt Outdated Show resolved Hide resolved
@claucambra
Copy link
Collaborator

Drone is complaining about the use of QNetworkConfiguration

@mgallien
Copy link
Collaborator Author

Drone is complaining about the use of QNetworkConfiguration

yes
so this API is deprecated in Qt 5.15 but with no replacement before Qt6
so I will have to make sure those warnings are disabled in Qt 5 builds

@mgallien mgallien force-pushed the feature/qt6 branch 3 times, most recently from edca614 to 8e8269c Compare May 31, 2022 21:46
@mgallien mgallien force-pushed the feature/qt6 branch 2 times, most recently from 7bc6669 to 75efa15 Compare October 7, 2022 12:38
@claucambra claucambra force-pushed the feature/qt6 branch 9 times, most recently from db09031 to f5b0319 Compare November 24, 2022 16:24
@claucambra claucambra changed the title allow detection of qt5 or qt6 Migrate to Qt 6 Nov 24, 2022
@claucambra
Copy link
Collaborator

Note I have removed the QML module-ification as it was broken and it is not strictly necessary for Qt6 migration, we can take care of it separately

@claucambra claucambra self-assigned this Nov 24, 2022
@claucambra claucambra force-pushed the feature/qt6 branch 2 times, most recently from 98194f7 to 9d32f9a Compare November 25, 2022 13:57
@claucambra claucambra marked this pull request as ready for review November 28, 2022 10:59
@claucambra
Copy link
Collaborator

@camilasan @allexzander @mgallien This is now ready for review

mgallien and others added 24 commits April 26, 2024 09:05
@mgallien
build appimage
ced6d32 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
build image for Qt6
430d56e 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
adapt ci checks to Qt6
7432fb4 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
when loading translation catalog, do not ignore the return value
910d7f0 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
avoid warning by ignoring the return value of QtConcurrent::run
3ad7ac9 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
fix order of init in a constructor to avoid warnings
4f178fa 
Signed-off-by: Matthieu Gallien <[email protected]>
@tobiasKaminsky @mgallien
Signed drone.yml
8ad2a82 
Signed-off-by: tobiasKaminsky <[email protected]>
@mgallien
fix compilation issues after rebase
aae9e84 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
fix some of the qml issues
060181f 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
use new qt 6.6.3 ci images
7d13202 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
NetrcParser tests are known to be broken
82a0c1d 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
header changes needed for clang/vs2022 compilers
3099628 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
add needed namespace for declarations read by Qt metaobject system
9b9ff4f 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
do some header includes clean-up as recommended by compiler
a05ac62 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
add NextcloudSslCertificate to wrap QSslCertificate in QHash
1533670 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
fully qualify types for use with Qt metaobject system
20db6b6 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
fix compilation issues on windows
bebb8e1 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
fix compilation after rebase
a357570 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
make it easy to find out that this branch is Qt6 based
2d5753c 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
fix compilation of AppImage packages
794db30 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
use the correct Qt6 build in newer CI images
5bed41a 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
fix build issue after rebase
347285b 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
AppImage build tool for Qt needs to know our qml files
07c2554 
gives the path to qml files such that needed Qt qml modules are deployed
correctly inside the AppImage package

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
windows needs an explicit QML import path to be set
3770eec 
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 <[email protected]>
@mgallien mgallien merged commit 810d8f1 into master Apr 26, 2024
8 of 12 checks passed
@mgallien mgallien deleted the feature/qt6 branch April 26, 2024 07:05
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-4584-3770eec050da2affdd342fb4f8cca2162648691c-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Apr 26, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@p-fruck p-fruck mentioned this pull request Jun 28, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allexzander allexzander allexzander approved these changes

@claucambra claucambra claucambra approved these changes

@camilasan camilasan Awaiting requested review from camilasan

Assignees

@claucambra claucambra

Labels
Qt 6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upgrade to QT6
5 participants
@mgallien @claucambra @allexzander @nextcloud-desktop-bot @tobiasKaminsky