Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb

src/plugins/debugger/qml/qmlengine.h

@@ -79,6 +79,8 @@ private:
     bool isSynchronous() const override { return false; }
     bool canDisplayTooltip() const override { return false; }
 
+    void resetLocation() override;
+
     void executeStep() override;
     void executeStepOut() override;
     void executeNext() override;