aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktextnode_p.h
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-03-25 19:58:46 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-30 10:13:43 +0200
commitdfdc4ce825e814b30449cfa1c85d3d2f47f8a845 (patch)
tree50ee811dece571afe98484e3c2661bd0f97bfead /src/quick/items/qquicktextnode_p.h
parenta7cb4acd5077539f78afb7fd53a6ff4231b3d63f (diff)
TextEdit: Better support of QTextTable and inline images
Fix some issues with incremental updates found while playing with the Quick Controls textedit demo. -Grouping text blocks into a single text node is fine as long as it doesn't cross the boundary of a child frame (e.g. a table), otherwise all that node logic collapses. -Text tables are hard to split in a sensible way, ensure we treat them as one text node for the sake of simplicity. -Inline images can cause several text nodes to have the same apparent start position. Beef up the rewinding logic in markDirtyNodesForRange. Change-Id: Ib4518bcd9303035fa00d9f4b16da7ca6c88e2313 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/quick/items/qquicktextnode_p.h')
-rw-r--r--src/quick/items/qquicktextnode_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextnode_p.h b/src/quick/items/qquicktextnode_p.h
index 2031669639..f5de6cc9b6 100644
--- a/src/quick/items/qquicktextnode_p.h
+++ b/src/quick/items/qquicktextnode_p.h
@@ -118,6 +118,7 @@ private:
QScopedPointer<QQuickTextNodeEngine> m_engine;
friend class QQuickTextEdit;
+ friend class QQuickTextEditPrivate;
};
QT_END_NAMESPACE