diff options
author | Mitch Curtis <mitch.curtis@digia.com> | 2014-03-31 17:45:37 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 17:45:37 +0200 |
commit | bd822bedfea5126b12c32523a68c3a1ac7a8931d (patch) | |
tree | 0fafd5ac037e3b62ad45e8808989ec89155618b4 /src/corelib/doc/snippets/code/src_corelib_thread_qthread.cpp | |
parent | 84c10500b1730e8d947732728d190fde612fc840 (diff) | |
parent | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/doc/snippets/code/src_corelib_thread_qthread.cpp')
-rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_thread_qthread.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qthread.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qthread.cpp index fde37bb549..5c6055defe 100644 --- a/src/corelib/doc/snippets/code/src_corelib_thread_qthread.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_thread_qthread.cpp @@ -47,7 +47,7 @@ class WorkerThread : public QThread Q_OBJECT void run() Q_DECL_OVERRIDE { QString result; - /* expensive or blocking operation */ + /* ... here is the expensive or blocking operation ... */ emit resultReady(result); } signals: @@ -71,7 +71,8 @@ class Worker : public QObject public slots: void doWork(const QString ¶meter) { - // ... + QString result; + /* ... here is the expensive or blocking operation ... */ emit resultReady(result); } @@ -87,7 +88,7 @@ public: Controller() { Worker *worker = new Worker; worker->moveToThread(&workerThread); - connect(workerThread, &QThread::finished, worker, &QObject::deleteLater); + connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater); connect(this, &Controller::operate, worker, &Worker::doWork); connect(worker, &Worker::resultReady, this, &Controller::handleResults); workerThread.start(); |