-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Qt6 + ubuntu #4679
Merged
Merged
Qt6 + ubuntu #4679
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
7e61781
Adjust qml libraries import statement.
daschuer 0ce2ec9
Finalize mixxx binary manually for cmake < 3.21
daschuer 4e1d0e7
Import MixxxPlugin
daschuer fd954c6
Add missing virtual destructor overload
daschuer 67dde53
Added a comment why we use qt_add_executable()
daschuer 224aa13
SET CMP0099 NEW to avoid a warning
daschuer 6e3ea5b
Import Mixxx Module als OPTIONAL_IMPORTS because not all types make u…
daschuer 77125f4
Improve comments around finalizing
daschuer 1cda499
Merge remote-tracking branch 'upstream/main' into qt6_ubuntu
daschuer 83c710a
Update res/qml/Mixxx/qmldir from auto-generated version
daschuer 1989638
Remove version guard around qt_add_executable because we are not sure…
daschuer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a comment that explains why this is necessary.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my test with cmake 3.16 it was actually not necessary.
It is just mentioned as the counterpart to the required qt-finalize-target which takes care of object order during linking. See https://doc.qt.io/qt-6/qt-finalize-target.html#qt6-finalize-target
So I think it is better to add it and follow the docs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From the docs I don't see any indication why this is only necessary on cmake < 3.21?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"This is especially important if using a statically built Qt or a CMake version earlier than 3.21."
There is also a pending PR that removes the related tests in the QT CI for cmake > 3.21. Unfortunately I do not have saved the link.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I read that too, but in my understanding it means "It's always important, but especially important on CMake < 3.21". So I don't think we should use a version guard here. Less code paths = less chances we run into weird bugs that CI doesn't detect or that we can't reproduce.
I tested it with this patch on CMake 3.22.2 and it works fine: