Backport changes to v4.6.x branch #20498
Merged
Conversation
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
glassez
previously approved these changes
Mar 13, 2024
PR qbittorrent#20529. Closes qbittorrent#20367. --------- Co-authored-by: thalieht <thalieht@users.noreply.github.com> Co-authored-by: Vladimir Golovnev <glassez@yandex.ru>
glassez
previously approved these changes
Mar 14, 2024
AppVeyor is the only CI that uses qmake, others are using cmake. Also that commit didn't have a qmake equivalent or at least I didn't bother to find one (it was originally targeted for master branch anyway). I would suggest leaving it out of v4.6.x if there are concerns of it. |
I believe that the problem isn't qmake. Most likely @sledgehammer999 just didn't ship there such "private" Qt headers that is used by your PR. |
|
@Chocobo1 thanks for the hint. That fixed it. Can someone approve this again? I'll try to do a stable+unstable release this weekend. |
glassez
previously approved these changes
Mar 16, 2024
Chocobo1
previously approved these changes
Mar 16, 2024
Updated a couple of strings with more accurate wording. PR qbittorrent#20545
This comment was marked as resolved.
This comment was marked as resolved.
glassez
previously approved these changes
Mar 21, 2024
glassez
approved these changes
Mar 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR #20465 had some conflicts in
addnewtorrentdialog.handmainwindow.cppwhich I believe I resolved correctly. The rest of the patch was applied cleanly.