diff options
author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-11-03 14:06:36 +0200 |
---|---|---|
committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-11-03 14:06:36 +0200 |
commit | f0a4a3ef6a1b4bfd596f079e1dd1d219bcc9d8a6 (patch) | |
tree | 831a830dd856a6035a77a6b77c2a4bd7effc534c /src/libs/installer/component.cpp | |
parent | c4c211c73c987dc267899a2084da98b87ff45340 (diff) | |
parent | 83b669586bd24fab082720876ff8aea75264ec36 (diff) |
Merge remote-tracking branch 'origin/4.5'
Change-Id: Ic3759bb073b00a168ec3348122484514e02138f5
Diffstat (limited to 'src/libs/installer/component.cpp')
-rw-r--r-- | src/libs/installer/component.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 5d21cd1da..e6c8eac34 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -1081,10 +1081,12 @@ OperationList Component::operations(const Operation::OperationGroups &mask) cons d->m_operations.append(d->m_licenseOperation); } } - OperationList operations = d->m_operations; - QtConcurrent::blockingFilter(operations, [&](const Operation *op) { - return mask.testFlag(op->group()); - }); + OperationList operations; + std::copy_if(d->m_operations.begin(), d->m_operations.end(), std::back_inserter(operations), + [&](const Operation *op) { + return mask.testFlag(op->group()); + } + ); return operations; } |