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

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1fd9c4b
Added unit test building documentation - issue #18
Nov 4, 2019
912abff
Fix for issue #13 - check canceled before finished
vpicaver Aug 5, 2019
60f9cff
Fixed issue #15
vpicaver Aug 8, 2019
21b30a9
Added QBS product for import into other builds
Nov 1, 2019
99b4745
Added finished() - issue #21
Nov 1, 2019
4f2d4ae
Renamed finished() to completed()
Feb 17, 2020
6ec3c36
Fixed threaded cancel / finished crashing issue when context is in a …
vpicaver Feb 27, 2020
ba147cc
Merge branch 'local-02'
vpicaver Feb 28, 2020
c6a74ab
Merge branch 'masterDept2'
vpicaver Feb 28, 2020
76ecb29
Fixed Combiner should honor child progress #30
vpicaver Mar 18, 2020
cfe3f46
Fixed issue #31
vpicaver Mar 18, 2020
3dc6491
Working on cancel forward
vpicaver Mar 18, 2020
79d27b5
Fixed issue #4
vpicaver Mar 18, 2020
b0d1032
Fixed progress reporting for complete()
vpicaver Mar 19, 2020
6489ad7
Update to README.md
vpicaver Mar 19, 2020
a7a36be
Progress emit only when changed
vpicaver Mar 22, 2020
fbb2a0b
combiner can now take QList<QFuture<T>>
vpicaver Mar 22, 2020
2f68f49
Improved the Combined progress code
vpicaver Mar 22, 2020
3d7012e
Fixes issue #33
vpicaver Mar 27, 2020
0d4203f
Fixed completed() with empty QList()
vpicaver Mar 29, 2020
0da1348
Only cancel future if it's running and not finished.
Nov 30, 2020
570f82f
Fixed issue #37 - Cancelation now propagates to child futures
Feb 13, 2021
afcf034
Switch to QSharedPointer for cancelOnce
Feb 15, 2021
07066cc
Merge remote-tracking branch 'beu/master'
Feb 15, 2021
b99ffc2
Moved std::shared_ptr to QSharedPointer in bugtests.cpp
Feb 15, 2021
4e47d20
Fixed old Qt version build issue
Feb 15, 2021
8c4ccd1
Fixed memory leak in testcases
Feb 17, 2021
8ddec40
Merge remote-tracking branch 'beu/master'
Feb 17, 2021
2711954
Added valgrind suppressions for QVector
vpicaver Feb 17, 2021
c6268d3
Add more missing suppresions
Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Switch to QSharedPointer for cancelOnce
  • Loading branch information
Philip Schuchardt committed Feb 15, 2021
commit afcf03476d17a8664ab97b6a0b5f84e26fce7e99
2 changes: 1 addition & 1 deletion asyncfuture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,7 @@ static QFuture<DeferredType> execute(QFuture<T> future, const QObject* contextOb
defer->setParentProgressValue(future.progressValue());
defer->setParentProgressRange(future.progressMinimum(), future.progressMaximum());

auto cancelOnce = std::make_shared<CancelOnce<Canceled>>(onCanceled);
auto cancelOnce = QSharedPointer<CancelOnce<Canceled>>::create(onCanceled);

watch(future,
contextObject,
Expand Down