diff options
author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-15 14:30:44 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 04:28:49 +0100 |
commit | c79f36c51f24905c188a1a6a7e2b38960713f093 (patch) | |
tree | 9982302a6b605ba5a0704eec1065f9536c7905ce /src/quick/items/qquicktextedit_p.h | |
parent | ece70ccba8718804bf8f42dafdcda00f8caa4d1a (diff) |
Have input method hints on only classes using them
Removed inputMethodHints setter and getter from QQuickItem.
No need to consume memory for input method hints on every item when
only QQuickTextInput and QQuickTextEdit actually use them.
Additionally introduced change signals on the editor hint properties.
Change-Id: Ice380d4f4dd47fdde73d2468f4a44a7d1540ad45
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit_p.h')
-rw-r--r-- | src/quick/items/qquicktextedit_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 0db85bb5fa..d71759f466 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -88,7 +88,7 @@ class Q_AUTOTEST_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem Q_PROPERTY(bool activeFocusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY activeFocusOnPressChanged) Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection NOTIFY persistentSelectionChanged) Q_PROPERTY(qreal textMargin READ textMargin WRITE setTextMargin NOTIFY textMarginChanged) - Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints) + Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints NOTIFY inputMethodHintsChanged) Q_PROPERTY(bool selectByMouse READ selectByMouse WRITE setSelectByMouse NOTIFY selectByMouseChanged) Q_PROPERTY(SelectionMode mouseSelectionMode READ mouseSelectionMode WRITE setMouseSelectionMode NOTIFY mouseSelectionModeChanged) Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged) @@ -190,6 +190,9 @@ public: qreal textMargin() const; void setTextMargin(qreal margin); + Qt::InputMethodHints inputMethodHints() const; + void setInputMethodHints(Qt::InputMethodHints hints); + bool selectByMouse() const; void setSelectByMouse(bool); @@ -265,6 +268,7 @@ Q_SIGNALS: void inputMethodComposingChanged(); void effectiveHorizontalAlignmentChanged(); void baseUrlChanged(); + void inputMethodHintsChanged(); public Q_SLOTS: void selectAll(); |