aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitem.h
diff options
context:
space:
mode:
authorPekka Vuorela <pekka.ta.vuorela@nokia.com>2012-01-20 14:07:20 +0200
committerQt by Nokia <qt-info@nokia.com>2012-01-27 15:38:09 +0100
commited576da6712d881b87a3fffcbddbae925157d265 (patch)
tree57fc5d5e2fd8ef7fd27fa45e18d5b94771effa4c /src/quick/items/qquickitem.h
parent8aa187fec80810d37107341ca6dc53264187ae9d (diff)
Enhance editors notifying input panel for input method changes
Introduced protected QQuickItem::updateInputMethod() and removed similar, but badly named updateMicroFocus(). Added some missing notifications from the editors and avoided unnecessary updates when not having focus. Change-Id: Id5c00e87dc26fd35c3f919006817511d4ed6418d Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitem.h')
-rw-r--r--src/quick/items/qquickitem.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index 0dd896af3d..684910a112 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -324,7 +324,6 @@ public:
public Q_SLOTS:
void update();
- void updateMicroFocus();
Q_SIGNALS:
void childrenRectChanged(const QRectF &);
@@ -359,6 +358,8 @@ protected:
bool isComponentComplete() const;
virtual void itemChange(ItemChange, const ItemChangeData &);
+ void updateInputMethod(Qt::InputMethodQueries queries = Qt::ImQueryInput);
+
void setImplicitWidth(qreal);
bool widthValid() const; // ### better name?
void setImplicitHeight(qreal);