diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-16 09:41:23 +0200 |
| commit | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (patch) | |
| tree | 9a799be282e6c0d6544d9f8c872073f83e6c0475 /src/corelib/thread/qfutureinterface.cpp | |
| parent | 7e8705f6632428a8d9a937ab5fe087999347b3dd (diff) | |
| parent | f255b1e8e297e7e1363921580007145cff574e0d (diff) | |
| download | qtbase-wip/qt6.tar.gz | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"wip/qt6
Diffstat (limited to 'src/corelib/thread/qfutureinterface.cpp')
| -rw-r--r-- | src/corelib/thread/qfutureinterface.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index 8f4cae8816..6430f38a3b 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -429,6 +429,11 @@ QMutex *QFutureInterfaceBase::mutex() const return &d->m_mutex; } +QMutex &QFutureInterfaceBase::mutex(int) const +{ + return d->m_mutex; +} + QtPrivate::ExceptionStore &QFutureInterfaceBase::exceptionStore() { return d->m_exceptionStore; |