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.

Sign up for GitHub

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

Jump to bottom

Backport changes to v4.3.x branch #15150

Merged
merged 8 commits into from
Jul 5, 2021
Merged

Backport changes to v4.3.x branch #15150

merged 8 commits into from
Jul 5, 2021

Conversation

glassez
Copy link
Member

@glassez glassez commented Jul 1, 2021 •
edited
Loading

Backport changes from the following PRs:
#13307
#14816
#14966
#14983
#15098
#15137

glassez and others added 2 commits July 1, 2021 09:44
@glassez
Don't forget to start "watch timer"
d198ee9
@tgregerson @glassez
Don't close tags menu when toggling items (qbittorrent#15098)
c06d6ea 
The issue was resolved by using QAction::toggled signal instead of
QAction::triggered. In QT 5.15+ the latter signal causes a QMenu
to close, whereas the former does not. Closes qbittorrent#13492.
@glassez glassez requested a review from Chocobo1 July 1, 2021 07:33
@glassez glassez added this to the 4.3.7 milestone Jul 1, 2021
@glassez glassez mentioned this pull request Jul 1, 2021
Merged
@glassez
Don't overwrite tracker message
6a8a1f6 
Use one of the tracker endpoint messages.
@glassez
Provide tracker peers count via TrackerEntry
81de077 
Don't expose additional accessor in Torrent interface.
@glassez glassez mentioned this pull request Jul 1, 2021
Merged
@xavier2k6
Copy link
Member

xavier2k6 commented Jul 1, 2021 •
edited
Loading

#14966

??
#14983
#13307

Chocobo1
Chocobo1 previously approved these changes Jul 2, 2021
View reviewed changes
@glassez
Copy link
Member Author

glassez commented Jul 2, 2021

#14966

??
#14983
#13307

@Chocobo1, what do you think?

@FranciscoPombal
Copy link
Member

FranciscoPombal commented Jul 2, 2021 •
edited
Loading

@glassez

#14966
??
#14983
#13307

@Chocobo1, what do you think?

FWIW, I agree with backporting those PRs, especially the file pool one. In fact, I thought thev4_3_x branch already had it.

@Chocobo1
Copy link
Member

Chocobo1 commented Jul 3, 2021

@Chocobo1, what do you think?

The real Chocobo1 here, I think it is OK to have them in v4_3_x branch.

kasper93 and others added 3 commits July 3, 2021 11:16
@kasper93 @glassez
Suppress C4267 conversion warnings
81ad324 
- warning C4267: 'initializing': conversion from 'size_t' to 'int',
  possible loss of data

Caused by mismatch between size_type of std and Qt containers. It is
safe to cast to int as all of those containers hold low number of
objects.
@glassez
Bump file pool size (qbittorrent#14966)
a3f039f
@xavier2k6 @glassez
Update AppVeyor CI image to Visual Studio 2019 (qbittorrent#14983)
500d0e7 
Update AppVeyor CI image to Visual Studio 2019
@xavier2k6
Copy link
Member

AppVeyor:
https://ci.appveyor.com/project/qbittorrent/qbittorrent/builds/39854324#L217

(Trivial)
Should we also update GHA?

  • vcpkg/libtorrent commits

@glassez
Copy link
Member Author

glassez commented Jul 3, 2021

The real Chocobo1 here, I think it is OK to have them in v4_3_x branch.

Done.

@glassez glassez requested a review from Chocobo1 July 3, 2021 11:12
@xavier2k6
Copy link
Member

especially the file pool one

#14962 (comment)

Chocobo1
Chocobo1 approved these changes Jul 5, 2021
View reviewed changes
Copy link
Member

@Chocobo1 Chocobo1 left a comment

Choose a reason for hiding this comment

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

@glassez
Can you update the first post to include the original PR numbers? This should help tracking what is backported.

@glassez glassez merged commit ede4291 into qbittorrent:v4_3_x Jul 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Chocobo1 Chocobo1 Chocobo1 approved these changes

Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
4.3.7
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@glassez @xavier2k6 @FranciscoPombal @Chocobo1 @tgregerson @kasper93