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

Fixup build on qt > 5.14 #2

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Fixup build on qt > 5.14 #2

merged 1 commit into from
Dec 22, 2022

Conversation

neochapay
Copy link
Contributor

No description provided.

Copy link
Contributor

@pvuorela pvuorela left a comment

Choose a reason for hiding this comment

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

There now being a bunch of -qt6 library versions on PRs, I'm not entirely sure should we go that direction everywhere and reintroduce two separate versions when we've just gotten rid of the qt4 leftovers. Also pondering how you are using this since the .spec is still qt5-only. Building with some alternative system?

Suppose the -qt6 vs -qt5 matters more when the different versions need to be parallel installable. At least on sailfish this is only needed by few system components so not sure yet if that parallel installability would be ever needed. Not a suggestion yet, just thinking aloud, but one alternative could be just renaming the whole thing as -qt. Or then uglier option could be to start by compiling the -qt5 library with qt 6.

For the qt 5.14 #ifdeffing I would have no objections. Could also just start by having that first.

src/qusbmoded.cpp Show resolved Hide resolved
@neochapay
Copy link
Contributor Author

There now being a bunch of -qt6 library versions on PRs, I'm not entirely sure should we go that direction everywhere and reintroduce two separate versions when we've just gotten rid of the qt4 leftovers. Also pondering how you are using this since the .spec is still qt5-only. Building with some alternative system?

Yeap for nemomobile

@neochapay neochapay changed the title Fixup build on qt6 Fixup build on qt > 5.14 Dec 22, 2022
src/src.pro Outdated Show resolved Hide resolved
@pvuorela pvuorela merged commit 927c865 into sailfishos:master Dec 22, 2022
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.

2 participants