diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2020-10-13 13:22:46 +0000 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-10-14 12:17:08 +0000 |
commit | 7cc478cfb176c691023fc44c5de507527432da07 (patch) | |
tree | 6c9d935dd67248634926849ed6f7df85e44c95ba | |
parent | 76febea8ee25f2abae112be1534912f5368d3bda (diff) |
Revert "QmlDesigner: Keep possible imports updated"
This reverts commit a9619b53f36209036306e8d2738995edbc13d92b
Reason for revert: broke stop puppet debugging feature
Change-Id: I88cf4ca7503a6bd7c3d8309cd7c3220428d07a20
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r-- | src/plugins/qmldesigner/designercore/include/rewriterview.h | 2 | ||||
-rw-r--r-- | src/plugins/qmldesigner/designercore/model/rewriterview.cpp | 20 |
2 files changed, 2 insertions, 20 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index 0601da3acf..5eae2f221f 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -190,7 +190,6 @@ protected: // functions private: //variables ModelNode nodeAtTextCursorPositionHelper(const ModelNode &root, int cursorPosition) const; void setupCanonicalHashes() const; - void handleLibraryInfoUpdate(); TextModifier *m_textModifier = nullptr; int transactionLevel = 0; @@ -211,7 +210,6 @@ private: //variables std::function<void(bool)> m_setWidgetStatusCallback; bool m_hasIncompleteTypeInformation = false; bool m_restoringAuxData = false; - bool m_modelAttachPending = false; mutable QHash<int, ModelNode> m_canonicalIntModelNode; mutable QHash<ModelNode, int> m_canonicalModelNodeInt; diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index f7a1254035..86b561548e 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -72,12 +72,7 @@ RewriterView::RewriterView(DifferenceHandling differenceHandling, QObject *paren m_textToModelMerger(new Internal::TextToModelMerger(this)) { m_amendTimer.setSingleShot(true); - m_amendTimer.setInterval(400); connect(&m_amendTimer, &QTimer::timeout, this, &RewriterView::amendQmlText); - - QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); - connect(modelManager, &QmlJS::ModelManagerInterface::libraryInfoUpdated, - this, &RewriterView::handleLibraryInfoUpdate, Qt::QueuedConnection); } RewriterView::~RewriterView() = default; @@ -94,8 +89,6 @@ Internal::TextToModelMerger *RewriterView::textToModelMerger() const void RewriterView::modelAttached(Model *model) { - m_modelAttachPending = false; - if (model && model->textModifier()) setTextModifier(model->textModifier()); @@ -109,12 +102,10 @@ void RewriterView::modelAttached(Model *model) if (!(m_errors.isEmpty() && m_warnings.isEmpty())) notifyErrorsAndWarnings(m_errors); - if (hasIncompleteTypeInformation()) { - m_modelAttachPending = true; + if (hasIncompleteTypeInformation()) QTimer::singleShot(1000, this, [this, model](){ modelAttached(model); }); - } } void RewriterView::modelAboutToBeDetached(Model * /*model*/) @@ -812,13 +803,6 @@ void RewriterView::setupCanonicalHashes() const } } -void RewriterView::handleLibraryInfoUpdate() -{ - // Trigger dummy amend to reload document when library info changes - if (isAttached() && !m_modelAttachPending) - m_amendTimer.start(); -} - ModelNode RewriterView::nodeAtTextCursorPosition(int cursorPosition) const { return nodeAtTextCursorPositionHelper(rootModelNode(), cursorPosition); @@ -1021,7 +1005,7 @@ void RewriterView::qmlTextChanged() auto &viewManager = QmlDesignerPlugin::instance()->viewManager(); if (viewManager.usesRewriterView(this)) { QmlDesignerPlugin::instance()->viewManager().disableWidgets(); - m_amendTimer.start(); + m_amendTimer.start(400); } #else /*Keep test synchronous*/ |