From 8e949e741bab0ee084444bb176a57ad61deb0f3f Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 15 Feb 2013 18:25:47 +0100 Subject: Add QQuickTextDocument Adding QQuickTextDocument as a way to access the QTextDocument of QQuickTextEdit from C++. This makes it possible to use a QSyntaxHighlighter from C++ without exposing more than one single qml property in the TextEdit. Change-Id: If1790b591493adcb0b68aef0c8ca706e00450657 Reviewed-by: Alan Alpert Reviewed-by: Jens Bache-Wiig --- src/quick/items/qquicktextedit_p.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/quick/items/qquicktextedit_p.h') diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 0538270cd4..744a7e290d 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE +class QQuickTextDocument; class QQuickTextEditPrivate; class Q_QUICK_PRIVATE_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem { @@ -99,6 +100,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem #endif Q_PROPERTY(QUrl baseUrl READ baseUrl WRITE setBaseUrl RESET resetBaseUrl NOTIFY baseUrlChanged) Q_PROPERTY(RenderType renderType READ renderType WRITE setRenderType NOTIFY renderTypeChanged) + Q_PROPERTY(QQuickTextDocument *textDocument READ textDocument FINAL) public: QQuickTextEdit(QQuickItem *parent=0); @@ -247,6 +249,8 @@ public: Q_INVOKABLE QString getText(int start, int end) const; Q_INVOKABLE QString getFormattedText(int start, int end) const; + QQuickTextDocument *textDocument(); + Q_SIGNALS: void textChanged(); void contentSizeChanged(); @@ -339,6 +343,7 @@ protected: QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData); friend class QQuickTextUtil; + friend class QQuickTextDocument; private: Q_DISABLE_COPY(QQuickTextEdit) -- cgit v1.2.3