diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-28 12:36:59 +0000 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-29 10:55:42 +0000 |
| commit | f2c3b52c6c513ebba9dc0db69efe8bdbf6be8334 (patch) | |
| tree | ba924e5dfb28339e517dc1868bfe5ecf228d261d /src/corelib/thread/qthreadpool.h | |
| parent | bd520ccc3c5742e7af61fef66bab96575b7b67ac (diff) | |
Revert "Port QThreadPool to the new property system"
This reverts commit 8f8405e04642b98663d4752d4ae76c304ae33b01.
Reason for revert: Appears not entirely thread-safe and caused QTBUG-90705
Change-Id: I390c0b1a555a18e6a095b52010371d017071e26b
Fixes: QTBUG-90705
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/thread/qthreadpool.h')
| -rw-r--r-- | src/corelib/thread/qthreadpool.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/corelib/thread/qthreadpool.h b/src/corelib/thread/qthreadpool.h index 3e601dd963..a559eff49a 100644 --- a/src/corelib/thread/qthreadpool.h +++ b/src/corelib/thread/qthreadpool.h @@ -56,10 +56,10 @@ class Q_CORE_EXPORT QThreadPool : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QThreadPool) - Q_PROPERTY(int expiryTimeout READ expiryTimeout WRITE setExpiryTimeout BINDABLE bindableExpiryTimeout) - Q_PROPERTY(int maxThreadCount READ maxThreadCount WRITE setMaxThreadCount BINDABLE bindableMaxThreadCount) + Q_PROPERTY(int expiryTimeout READ expiryTimeout WRITE setExpiryTimeout) + Q_PROPERTY(int maxThreadCount READ maxThreadCount WRITE setMaxThreadCount) Q_PROPERTY(int activeThreadCount READ activeThreadCount) - Q_PROPERTY(uint stackSize READ stackSize WRITE setStackSize BINDABLE bindableStackSize) + Q_PROPERTY(uint stackSize READ stackSize WRITE setStackSize) friend class QFutureInterfaceBase; public: @@ -76,17 +76,14 @@ public: int expiryTimeout() const; void setExpiryTimeout(int expiryTimeout); - QBindable<int> bindableExpiryTimeout(); int maxThreadCount() const; void setMaxThreadCount(int maxThreadCount); - QBindable<int> bindableMaxThreadCount(); int activeThreadCount() const; void setStackSize(uint stackSize); uint stackSize() const; - QBindable<uint> bindableStackSize(); void reserveThread(); void releaseThread(); |