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 to v4_1_x #10772

Merged
merged 11 commits into from
Jun 16, 2019
Merged

Backport to v4_1_x #10772

merged 11 commits into from
Jun 16, 2019

Conversation

Chocobo1
Copy link
Member

@Chocobo1 Chocobo1 commented Jun 6, 2019 •
edited
Loading

@Chocobo1
Remove redundant disconnect()
c01aed8 
The dialog is going out-of-scope in these instance and the signal-slot connection will disconnect
automatically.
@Chocobo1
Fix unable to control add torrent dialogs when opened simultaneously
ec13d19
@Chocobo1 Chocobo1 added the GUI GUI-related issues/changes label Jun 6, 2019
@Chocobo1 Chocobo1 added this to the 4.1.7 milestone Jun 6, 2019
@Chocobo1 Chocobo1 force-pushed the backport branch 8 times, most recently from f1ce7a9 to ec13d19 Compare June 7, 2019 06:55
Chocobo1 and others added 9 commits June 10, 2019 10:34
@Chocobo1
Move renameSelectedFile(BitTorrent::TorrentHandle *)
377f310
@Chocobo1
Move renameSelectedFile(BitTorrent::TorrentInfo &)
e2f3dad
@Chocobo1
Fix unable to rename folder on Windows
06f503b 
The bug occurs when the new path and old path only differ by letter case.
@silverqx @Chocobo1
Focus behavior row in Options dialog
01e4179
@Chocobo1
Properly remove empty leftover folders after rename
e329c41 
TorrentInfo::origFilePath will return the very original path from
.torrent file, not the most recent file path before the rename operation
and thus the code would not be working as we expected.
@Chocobo1
Don't remove parent directories
d376d91 
QDir::rmpath removes *all* parent directories while QDir::rmdir removes
the specified directory.
@Chocobo1
Log save_resume_data_failed_alert
3fdab88
@Chocobo1
Fix updated save path not saved for paused torrents
8d26a22
@Chocobo1
Reorder if conditions slightly
74e5274
@Chocobo1 Chocobo1 removed the GUI GUI-related issues/changes label Jun 16, 2019
@Chocobo1
Copy link
Member Author

@glassez
I think this PR is ready to merge, I have no more to backport.

glassez
glassez approved these changes Jun 16, 2019
View reviewed changes
Copy link
Member

@glassez glassez left a comment

Choose a reason for hiding this comment

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

I hope it's not your backported code Travis fails because of.

@Chocobo1 Chocobo1 merged commit e8be3bf into qbittorrent:v4_1_x Jun 16, 2019
@Chocobo1 Chocobo1 deleted the backport branch June 16, 2019 17:00
@Chocobo1
Copy link
Member Author

TravisCI on v4_1_x was broken for some time already, so this PR should be fine.

@xavier2k6
Copy link
Member

xavier2k6 commented Jun 17, 2019 •
edited
Loading

@LordNyriox #10581 had a version of Qt 5.12.3 compiled - still crashes reported.

It may seem as OpenSSL 1.1.1x & Qt (up to & including 5.12.3) had/have compatibility issues. (OpenSSL 1.0x - ok)

Qt are fully implementing OpenSSL 1.1.1x support in Qt 5.13 releasing on 19th (if remains on schedule.....RC3 out) & I believe it will also be in Qt 5.12.4 (which has now released)

Latest Openssl Lib's are 1.0.2s/1.1.0k/1.1.1c

@xavier2k6
Copy link
Member

Qt 5.12.4 has been released.....Supports OpenSSL 1.1.1x
https://blog.qt.io/blog/2019/06/17/qt-5-12-4-released-support-openssl-1-1-1/

@LordNyriox
Copy link
Contributor

LordNyriox commented Jun 18, 2019 •
edited
Loading

@sledgehammer999: Any chance you will release qBittorrent 4.1.7 soon? I thought you said you were looking for an excuse?

Status of qBittorrent libraries (so you can build against current versions):

@Ryrynz
Copy link

Ryrynz commented Jun 19, 2019 •
edited
Loading

Is there anything really more to add to 4.1.7 aside from the three backported fixes here [https://github.com//pull/10816]

@xavier2k6
Copy link
Member

Qt 5.13 publicly released.
https://blog.qt.io/blog/2019/06/19/qt-5-13-released/

@xavier2k6
Copy link
Member

xavier2k6 commented Jun 19, 2019 •
edited
Loading

Hopefully both parts of this gets included.
Raise/removal of 64bit cache limit & cache limit MAX time.
#10194

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@glassez glassez glassez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.1.7
Development

Successfully merging this pull request may close these issues.
6 participants
@Chocobo1 @xavier2k6 @LordNyriox @Ryrynz @glassez @silverqx