diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-07-12 17:57:58 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-07-13 08:24:02 +0000 |
| commit | d41db62154dfbf6cb78f6a64e962939a79eec03c (patch) | |
| tree | 37afed3bdfbc2d2abf82aeb5b307fda24f8a5979 /src/corelib/thread/qfutureinterface.h | |
| parent | 7c82a49e6fc4ec606cffa4fa8d3ceb42c87439cd (diff) | |
Move QBasicFutureWatcher behind the ABI boundary
... and out of QtPrivate.
No inline API requires it anymore, so move it into the only TU using
it. Can't move it into the unnamed namespace because of the friend
declaration in QFutureInterfaceBase.
Pick-to: 6.6
Change-Id: I27452960492bc1193a4d0eaeb2acd913d4dd02a5
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/corelib/thread/qfutureinterface.h')
| -rw-r--r-- | src/corelib/thread/qfutureinterface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h index 4db3ebb8596..151584e66bc 100644 --- a/src/corelib/thread/qfutureinterface.h +++ b/src/corelib/thread/qfutureinterface.h @@ -39,8 +39,8 @@ template<class Function, class ResultType> class FailureHandler; #endif -class QBasicFutureWatcher; } +class QBasicFutureWatcher; class Q_CORE_EXPORT QFutureInterfaceBase { @@ -178,7 +178,7 @@ private: friend class QtPrivate::FailureHandler; #endif - friend class QtPrivate::QBasicFutureWatcher; + friend class QBasicFutureWatcher; template<class T> friend class QPromise; |