Merge remote-tracking branch 'origin/4.6' into 4.7

Conflicts:
	src/plugins/qnx/qnxplugin.cpp

Change-Id: I8ede5fa9c8daf3001e41fcba7cbee68edb9db3a6

src/plugins/debugger/qml/qmlengine.cpp

@@ -2166,6 +2166,10 @@ void QmlEnginePrivate::handleFrame(const QVariantMap &response)
         watchHandler->insertItem(item);
         evaluate(exp, -1, [this, iname, exp](const QVariantMap &response) {
             handleEvaluateExpression(response, iname, exp);
+
+            // If there are no scopes, "this" may be the only thing to look up.
+            if (currentFrameScopes.isEmpty())
+                checkForFinishedUpdate();
         });
     }