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

port slideshow to Qt 6 #2277

Merged
merged 3 commits into from Feb 4, 2024
Merged

port slideshow to Qt 6 #2277

merged 3 commits into from Feb 4, 2024

Conversation

jriddell
Copy link
Member

simple code copy so we have a Qt 5 and 6 version, although since the difference is only 1 line it might be better just to remove that one line.

@dalto8
Copy link
Contributor

dalto8 commented Jan 25, 2024

Maintaining parallel QML files seems like a nightmare.

@jriddell
Copy link
Member Author

a nightmare but it's what is done with the qml modules

src/CMakeLists.txt Outdated Show resolved Hide resolved
@adriaandegroot
Copy link
Contributor

So, to be clear:

  • makes a copy of all the QML things into a calamares-qt5 directory
  • tries to pick one of the two directories at build time based on the WITH_QT6 flag

I would suggest renaming and copying, so we end up with a calamars-qt5/ and a calamares-qt6/ under the qml/ directory.

And yes, maintaining Qt5 and Qt6 QML is a nightmare because of the source-incompatibilities. It is a road already taken, though, with the modules. I'd be willing to entertain a Qt6-only Calamares version (3.4?) once KDE Frameworks 6 happens and the KDE Megarelease is done.

@jriddell
Copy link
Member Author

@adriaandegroot yes that seems right. I renamed the directory as you suggested

@adriaandegroot adriaandegroot merged commit 2ea4d36 into calamares Feb 4, 2024
1 check passed
@adriaandegroot adriaandegroot deleted the slideshow-qt6 branch February 12, 2024 17:29
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

4 participants