Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/gui/image/qjpeghandler.cpp

Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0

2 files changed, 6 insertions, 4 deletions

diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index 18fdfb18f3..2ad24d33b1 100644
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -37,7 +37,8 @@ exampledirs += \
                snippets \
                ../../../examples/threads/ \
                ../../../examples/tools/ \
-               ../../../examples/json/
+               ../../../examples/json/ \
+               ../../../examples/network/dnslookup
 
 imagedirs   += images
 
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 &parameter) {
-        // ...
+        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();