diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/corelib/thread/qthread.cpp | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/corelib/thread/qthread.cpp')
| -rw-r--r-- | src/corelib/thread/qthread.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 77a5584f43..d33cc90127 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -58,8 +58,8 @@ QT_BEGIN_NAMESPACE */ QThreadData::QThreadData(int initialRefCount) - : _ref(initialRefCount), thread(0), threadId(0), - quitNow(false), loopLevel(0), eventDispatcher(0), canWait(true), isAdopted(false) + : _ref(initialRefCount), loopLevel(0), thread(0), threadId(0), + eventDispatcher(0), quitNow(false), canWait(true), isAdopted(false) { // fprintf(stderr, "QThreadData %p created\n", this); } @@ -407,7 +407,7 @@ QThread::QThread(QThreadPrivate &dd, QObject *parent) Note that deleting a QThread object will not stop the execution of the thread it manages. Deleting a running QThread (i.e. - isFinished() returns false) will probably result in a program + isFinished() returns \c false) will probably result in a program crash. Wait for the finished() signal before deleting the QThread. */ @@ -429,7 +429,7 @@ QThread::~QThread() } /*! - Returns true if the thread is finished; otherwise returns false. + Returns \c true if the thread is finished; otherwise returns \c false. \sa isRunning() */ @@ -441,7 +441,7 @@ bool QThread::isFinished() const } /*! - Returns true if the thread is running; otherwise returns false. + Returns \c true if the thread is running; otherwise returns \c false. \sa isFinished() */ |