-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Fix Qt Deprecations #6386
Fix Qt Deprecations #6386
Conversation
🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩
Linux
Windows
🤖{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://output.circle-artifacts.com/output/job/8c4b39a6-87d3-4665-825c-7e43350abe15/artifacts/0/lmms-1.3.0-alpha.1.196+gb3ccfeff2-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/sakertooth/lmms/238?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://output.circle-artifacts.com/output/job/431110e6-f24d-4885-a7fb-455897ac07f6/artifacts/0/lmms-1.3.0-alpha.1.196+gb3ccfeff2-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/sakertooth/lmms/237?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://output.circle-artifacts.com/output/job/b862e0b4-4b01-4227-b3e0-ec5971a78f37/artifacts/0/lmms-1.3.0-alpha.1.196+gb3ccfeff2-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/sakertooth/lmms/239?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/v0pesmhd7rismgq9/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/43907999"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/xbpjtwugjm34q7vd/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/43907999"}]}, "commit_sha": "b3ccfeff2de3542f82b54a88e55676e144901926"} |
I don't see anything in the 5.15 Qt docs about
It looks like |
Seems like I had Qt 6 on my system, so it compiled fine on my end and gave a warning for |
You don't need to revert, just check out #5619 for examples of how to handle deprecation stuff. :) |
Deprecation of
|
Alright, I think this should be fine then. 👍 |
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.
Mostly style changes to move the preprocessor directives to the beginning of the line.
One move request to put a doc comment back in place.
One question about removing a previously added deprecation section.
Co-authored-by: Kevin Zander <[email protected]>
54850b4
to
898e43d
Compare
Just for information, |
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 left only 1 minor comment. Code looks mostly OK.
@Veratil are you OK with the last rework commit? If yes, then there is only testing review left. |
Testing review failed! I rebased this to master on my local machine and loaded a large demo song ("Greippi - Krem Kaakkuja (Second Flight Remix).mmpz"). In master, the song plays normal, and the CPU is low if nothing is being played. In this branch, the song plays only with interruptions, and the CPU is high both when playing and when not playing. I assume that it's from the |
Does it do the same if you didn't rebase? |
Yes. I just did the rebase to exclude that a master commit would have caused the difference. Can you reproduce this issue? |
Unfortunately I can't even play it on any branch in my VM because it takes up too much CPU. It's constantly in the red. |
|
Can you please |
Sorry, disregard that. It was because I was doing a partial build for Pertaining to the issue you described above, my CPU usage is fairly high when playing the project and then stays on some middle ground constantly. Not sure what could be the issue. Going to do some testing. |
Tested this on master, and I am seeing the same issue. I do not think this issue originates from this PR. |
Dumb question, did you recompile and reinstall? Do you have a good computer? |
My computer is fine, truly (although having 8 GB of RAM can sometimes be a bottleneck under heavy load, it should be more than enough). I reconfigured my CMake configuration and rebuilt everything on the master branch, but the CPU usage issue remains. It stays high on idle. I forgot to mention that the playback for me has no interruptions of any kind even with the CPU being fairly high. |
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.
My bad. I tested with pulseaudio (which is not RT safe), and thus got very strange results.
With ALSA, I now get much better results. It plays well there. Testing passed.
Also, the last commit looks good. @Veratil shall we merge this?
Co-authored-by: Kevin Zander <[email protected]>
df5d815
to
5c77505
Compare
Co-authored-by: Kevin Zander <[email protected]>
5c77505
to
20dd50b
Compare
I'm okay with it. 👍 |
@sakertooth The PR is good, but can you please fix this merge conflict so we can merge it? |
Ah, just saw that the namespace PR was merged. Resolving merge conflicts soon. |
Co-authored-by: Kevin Zander <[email protected]>
cc2b9d2
to
e2f03d4
Compare
Co-authored-by: Kevin Zander <[email protected]> Co-authored-by: Dominic Clark <[email protected]>
e2f03d4
to
4735245
Compare
Co-authored-by: Kevin Zander <[email protected]> Co-authored-by: Dominic Clark <[email protected]>
8d9c35b
to
5ca9705
Compare
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 think there are 1 or 2 merge errors, but only whitespace.
Co-authored-by: Kevin Zander <[email protected]> Co-authored-by: Dominic Clark <[email protected]>
5ca9705
to
dc0b310
Compare
Co-authored-by: Kevin Zander <[email protected]> Co-authored-by: Dominic Clark <[email protected]>
dc0b310
to
3552f07
Compare
Co-authored-by: Kevin Zander <[email protected]> Co-authored-by: Dominic Clark <[email protected]>
3552f07
to
b3ccfef
Compare
Merge? |
Co-authored-by: Kevin Zander <[email protected]> Co-authored-by: Dominic Clark <[email protected]>
This PR fixes the following deprecations in src: