Skip to content
This repository has been archived by the owner on Dec 12, 2023. It is now read-only.

Merge vpicaver's fork #38

Merged
merged 30 commits into from
Mar 1, 2021
Merged

Merge vpicaver's fork #38

merged 30 commits into from
Mar 1, 2021

Conversation

vpicaver
Copy link
Contributor

No description provided.

Philip Schuchardt and others added 30 commits November 4, 2019 14:17
…different thread then watcher

- This commit also adds canceled to observe().context()
- Updated to the documentation going in more detail about using context()
# Conflicts:
#	asyncfuture.h
Fixed Observable().subscribe(...).future() aka DeferredFuture should forward progress on chained pipeline benlau#31
AsyncFuture now automatically forwards cancel to parent futures including QtConcurrent::mapping
- Also fixed progress range for asyncfuture
When a deferred is completed with a future it now pushes cancel to the completed future.
These suppression aren't needed for Qt 5.12.
There seem to be a bug in Qt 5.9. The suppression file already contains
similar suppressions.
@vpicaver vpicaver changed the title Merge vpicaver fork Merge vpicaver's fork Feb 17, 2021
@vpicaver
Copy link
Contributor Author

This fixes multiple bugs found in the master. @benlau do you think you can review this and merge it in so we can close some of the existing bugs?

@vpicaver
Copy link
Contributor Author

@benlau Do you have any suggestions on what I need to go to get this merged?

@benlau
Copy link
Owner

benlau commented Feb 28, 2021

@benlau Do you have any suggestions on what I need to go to get this merged?

Hi @vpicaver,

Thanks for the patch and sorry for keeping you waiting. In fact, I am scheduling a time to review the changes but unfortunately, I was too busy last week. Hopefully, I could respond this week.

@benlau benlau merged commit f2c773b into benlau:master Mar 1, 2021
@vpicaver
Copy link
Contributor Author

vpicaver commented Mar 1, 2021 via email

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants