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.

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

Support the KF6 based version of Dolphin #6320

Merged
merged 6 commits into from
Mar 6, 2024

Conversation

er-vin
Copy link
Member

@er-vin er-vin commented Dec 27, 2023

This is not a Qt6 port of the whole client. Still, KF6 based Dolphin is around the corner so make sure it will still benefit from the shell integration plugin.

This PR does some stylistic changes and cleanups to the code but this is mainly here to help the transition to the Qt6/KF6 build which seems a bit stricter by default than older versions.

The real important part of the work is the CMake adjustments and trying to detect both KF5 and KF6 KIO versions to figure out what's around.

Important: My current setup doesn't make it easy to test Qt5 and Qt6 based builds in parallel. So some more extensive testing from someone with a more traditional setup is likely welcome.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ Clang-Tidy found issue(s) with the introduced code (1/1)

Copy link

sonarcloud bot commented Dec 27, 2023

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

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.

Thank you!

@er-vin er-vin force-pushed the work/ervin/support-kf6-based-dolphin branch from 5cfbf32 to 89bf79c Compare February 18, 2024 11:34
@er-vin
Copy link
Member Author

er-vin commented Feb 18, 2024

Do we agree that the clang-tidy, windows and mac build are false positives? If someone confirms I'll go ahead, ignoring them, and merging this PR.

@mgallien
Copy link
Collaborator

mgallien commented Mar 6, 2024

Do we agree that the clang-tidy, windows and mac build are false positives? If someone confirms I'll go ahead, ignoring them, and merging this PR.

yes they are false positive
I am sorry as I am missing time to more quickly fix them (at least the windows one)
I have hopes to be able to fix the windows one this week

We remove one unused include which will disappear in KF6. Also we switch
to camel case includes without the module prefix.

Signed-off-by: Kevin Ottens <ervin@kde.org>
Signed-off-by: Kevin Ottens <ervin@kde.org>
The desktop to json conversion step will disappear with KF6

Signed-off-by: Kevin Ottens <ervin@kde.org>
Now if KF6 KIO is present, we build the Dolphin plugin against the Qt6
version of everything. Otherwise we keep assuming the Qt5 version of the
platform.

Signed-off-by: Kevin Ottens <ervin@kde.org>
@er-vin er-vin force-pushed the work/ervin/support-kf6-based-dolphin branch from 89bf79c to 38b59a8 Compare March 6, 2024 13:52
@er-vin er-vin dismissed GitHub Actions’s stale review March 6, 2024 13:55

Confirmed as false positive

@er-vin er-vin enabled auto-merge March 6, 2024 13:56
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6320-38b59a82bf8a4f6007f1eac2906ae3957e46eba7-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.

Copy link

sonarcloud bot commented Mar 6, 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

@er-vin er-vin disabled auto-merge March 6, 2024 14:51
@mgallien mgallien merged commit 7ed0b9a into master Mar 6, 2024
11 of 13 checks passed
@mgallien mgallien deleted the work/ervin/support-kf6-based-dolphin branch March 6, 2024 14:56
@mgallien mgallien added this to the 3.13.0 milestone Apr 24, 2024
@Beurt
Copy link

Beurt commented May 19, 2024

Hi,

I'm a KDE Neon User, I use de the release 3.13.0 of dolphin-nextcloud (installed with Nextcloud PPA) that should work properly with Plasma 6 (QT6/KF6), but I still don't have the sync indicators on files and no context menu in Dolphin (cf. my downstream ticket: https://bugs.kde.org/show_bug.cgi?id=483423#c2).

Am I the only one?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants