aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designercore/include/rewriterview.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qmldesigner/designercore/include/rewriterview.h')
-rw-r--r--src/plugins/qmldesigner/designercore/include/rewriterview.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index a1513128d7..0601da3acf 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -53,7 +53,7 @@ class ModelNodePositionStorage;
} //Internal
-struct CppTypeData
+struct QmlTypeData
{
QString superClassName;
QString importUrl;
@@ -61,6 +61,7 @@ struct CppTypeData
QString cppClassName;
QString typeName;
bool isSingleton = false;
+ bool isCppType = false;
};
class QMLDESIGNERCORE_EXPORT RewriterView : public AbstractView
@@ -158,7 +159,7 @@ public:
QStringList autoComplete(const QString &text, int pos, bool explicitComplete = true);
- QList<CppTypeData> getCppTypes();
+ QList<QmlTypeData> getQMLTypes() const;
void setWidgetStatusCallback(std::function<void(bool)> setWidgetStatusCallback);
@@ -189,6 +190,7 @@ protected: // functions
private: //variables
ModelNode nodeAtTextCursorPositionHelper(const ModelNode &root, int cursorPosition) const;
void setupCanonicalHashes() const;
+ void handleLibraryInfoUpdate();
TextModifier *m_textModifier = nullptr;
int transactionLevel = 0;
@@ -209,6 +211,7 @@ 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;