diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-01-24 09:25:38 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-01-24 09:37:54 +0000 |
| commit | 1daaf613dc56c5ffedefe7ca6938ae5b191f9411 (patch) | |
| tree | 6fdc48e49dca2766e71e01742ad104389e12be4f /src/s60installs/bwins/QtCoreu.def | |
| parent | 5fa35c4f14fc4bbd4ddcf747f1073bb65075256b (diff) | |
QFuture: add a missing include for qpromise.h
QPromise is now used in qfuture_impl.h, so we need to include it. Remove
qfuture.h include from qpromise.h, to avoid circular dependency.
As a drive-by, simplify a type-trait: is_convertible_v<T, S> is true
whenever is_same_v<T, S> is, so we don't need to instantiate both.
Fixes: QTBUG-100144
Pick-to: 6.3 6.2
Change-Id: Ic6df43d96d9d168cc44c2949e41c5e490f4c50ce
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/s60installs/bwins/QtCoreu.def')
0 files changed, 0 insertions, 0 deletions