diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:08:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:14:54 +0200 |
| commit | aadfe7d634de04519102c5827ca885dc2e2199c9 (patch) | |
| tree | d92db346ca95332b177036a53f1f6beb2e24fb74 /src/corelib/thread/qthreadpool.cpp | |
| parent | 4b6c1448047362b8c38d265e6414f0e3e59b8d37 (diff) | |
| parent | a732e16d5fd9dbf8a0289fec9f948b12e9ba2c19 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
src/plugins/platforms/cocoa/qcocoawindow.h
src/testlib/qtestsystem.h
Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5
Diffstat (limited to 'src/corelib/thread/qthreadpool.cpp')
| -rw-r--r-- | src/corelib/thread/qthreadpool.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index 2ebf910992..fd5a1106a0 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -606,17 +606,19 @@ void QThreadPool::reserveThread() ++d->reservedThreads; } -/*! \property QThreadPool::stacksize +/*! \property QThreadPool::stackSize This property contains the stack size for the thread pool worker threads. - The value of the property is uses when the thread pool creates - new threads only. Changing it has no effect for already created + The value of the property is only used when the thread pool creates + new threads. Changing it has no effect for already created or running threads. The default value is 0, which makes QThread use the operating - system default stack stize. + system default stack size. + + \since 5.10 */ void QThreadPool::setStackSize(uint stackSize) { |