Merge remote-tracking branch 'origin/4.3' into 4.4

Change-Id: I624040b7910d4025208709b22157869c6085df2f
2017-07-05 14:55:46 +02:00
parent 78f9ff036f 8e72432654
commit 11333a03cd
3 changed files with 33 additions and 23 deletions
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -122,7 +122,6 @@ private:
    QTimer m_contextPaneTimer;
    QComboBox *m_outlineCombo;
    QModelIndex m_outlineModelIndex;
-    bool m_blockOutLineCursorChanges = false;
    QmlJS::ModelManagerInterface *m_modelManager = nullptr;

    QmlJS::IContextPane *m_contextPane = nullptr;