diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:26 +0100 |
| commit | ff466a1881435f927f5df9ce1e5eac07d5591904 (patch) | |
| tree | 760e068743e6a8e1cc4ec63bb2f8e7dcef88b3e2 /src/quick/items/qquicktextedit_p.h | |
| parent | e04822f3c2a6b69b7d75e2039256aa2433c59dd2 (diff) | |
| parent | 4a3f6e58b591f2fe2204f7cbc1efc8abb0aade74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4globalobject.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/quick/items/qquicktext_p.h
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput_p.h
Change-Id: If07e483e03197cb997ef47a9c647a479cdb09f4c
Diffstat (limited to 'src/quick/items/qquicktextedit_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index ea47c3b60e..5320ecc2ca 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -215,7 +215,7 @@ public: #ifndef QT_NO_IM QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE; - Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; + Q_REVISION(4) Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; #endif qreal contentWidth() const; @@ -318,6 +318,7 @@ private Q_SLOTS: private: void markDirtyNodesForRange(int start, int end, int charDelta); void updateTotalLines(); + void invalidateFontCaches(); protected: void geometryChanged(const QRectF &newGeometry, @@ -342,6 +343,7 @@ protected: void inputMethodEvent(QInputMethodEvent *e) Q_DECL_OVERRIDE; #endif QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) Q_DECL_OVERRIDE; + void updatePolish(); friend class QQuickTextUtil; friend class QQuickTextDocument; |