diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
| commit | bc1cae774ad8cc084a98cb37d363770efbde025c (patch) | |
| tree | aeb16a5fa9093632eba6143fe53ef1dad3e383a4 /src/corelib/thread/qthread.cpp | |
| parent | 8d35ad8726f44c4e853b5a192203ffcbbd2476e1 (diff) | |
| parent | 26e876912435bdafbca2b425af43824d7ec5b876 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake
Diffstat (limited to 'src/corelib/thread/qthread.cpp')
| -rw-r--r-- | src/corelib/thread/qthread.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 9fd1dd059d..6a59043881 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -844,7 +844,7 @@ bool QThread::event(QEvent* event) return QObject::event(event); } -Qt::HANDLE QThread::currentThreadId() noexcept +Qt::HANDLE QThread::currentThreadIdImpl() noexcept { return Qt::HANDLE(currentThread()); } @@ -919,6 +919,16 @@ QThreadPrivate::~QThreadPrivate() delete data; } +void QThread::setStackSize(uint stackSize) +{ + Q_UNUSED(stackSize); +} + +uint QThread::stackSize() const +{ + return 0; +} + #endif // QT_CONFIG(thread) /*! |