QQuickTextControl - mouse events to override input context

 - Selection can start on top of preedit
 - Mouse press outside preedit commits
 - Double click to commit on top of preedit
 - Focus out to commit preedit

Similar to qtbase 4b3d88a9c67402b6a234d597bab25846f039bbdb and
b5c37d9e137dee2754335e83b8437dfd0e6cc7e7 for QTextEdit

Change-Id: Ib9c37528ba7fd588ee993b7ff33f79f96857e421
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/quick/items/qquicktextcontrol_p_p.h b/src/quick/items/qquicktextcontrol_p_p.h
index 8c06899e02..2b2e9cb35a 100644
--- a/src/quick/items/qquicktextcontrol_p_p.h
+++ b/src/quick/items/qquicktextcontrol_p_p.h
@@ -65,7 +65,6 @@ QT_BEGIN_NAMESPACE
 
 class QMimeData;
 class QAbstractScrollArea;
-class QInputContext;
 
 class QQuickTextControlPrivate : public QObjectPrivate
 {
@@ -164,9 +163,10 @@ public:
 
     void activateLinkUnderCursor(QString href = QString());
 
-    void append(const QString &text, Qt::TextFormat format = Qt::AutoText);
+    bool isPreediting() const;
+    void commitPreedit();
 
-    QInputContext *inputContext();
+    void append(const QString &text, Qt::TextFormat format = Qt::AutoText);
 
     QTextDocument *doc;
     bool cursorOn;
@@ -187,7 +187,7 @@ public:
     bool mousePressed;
 
     bool mightStartDrag;
-    QPoint dragStartPos;
+    QPoint mousePressPos;
     QPointer<QObject> contextObject;
 
     bool lastSelectionState;