Fix word selection in QLineControl

Word selection occasionally selected the word beforehand as well, in
both QLineEdit and TextInput.

Visual Test included to verify behavior.

Task-number: QTBUG-15818
Reviewed-by: Martin Jones

9 files changed, 1054 insertions, 2 deletions

diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index 5ea9dc4..12607c1 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -541,10 +541,10 @@ void QLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &cl
 */
 void QLineControl::selectWordAtPos(int cursor)
 {
-    int c = m_textLayout.previousCursorPosition(cursor, QTextLayout::SkipWords);
+    int c = m_textLayout.previousCursorPosition(cursor+1, QTextLayout::SkipWords);
     moveCursor(c, false);
     // ## text layout should support end of words.
-    int end = m_textLayout.nextCursorPosition(cursor, QTextLayout::SkipWords);
+    int end = m_textLayout.nextCursorPosition(c, QTextLayout::SkipWords);
     while (end > cursor && m_text[end-1].isSpace())
         --end;
     moveCursor(end, true);
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.0.png
new file mode 100644
index 0000000..fc34b1a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.1.png
new file mode 100644
index 0000000..fc34b1a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.2.png
new file mode 100644
index 0000000..fc34b1a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.3.png
new file mode 100644
index 0000000..fb2c90b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.4.png
new file mode 100644
index 0000000..fb2c90b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.5.png
new file mode 100644
index 0000000..e2231ff
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.5.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.qml
new file mode 100644
index 0000000..790dffa
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.qml
@@ -0,0 +1,1039 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "qtbug-15818.0.png"
+    }
+    Frame {
+        msec: 32
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 48
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 64
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 80
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 96
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 112
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 128
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 144
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 160
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 176
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 192
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 208
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 224
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 240
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 256
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 272
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 288
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 304
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 320
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 336
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 352
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 368
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 384
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 400
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 416
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 432
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 448
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 464
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 480
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 496
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 512
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 528
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 544
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 560
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 576
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 592
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 608
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 624
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 640
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 656
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 672
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 688
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 704
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 720
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 736
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 752
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 768
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 784
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 800
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 816
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 832
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 848
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 864
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 880
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 26; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 896
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 912
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 928
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 27; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 27; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 944
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 960
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 976
+        image: "qtbug-15818.1.png"
+    }
+    Frame {
+        msec: 992
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 27; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1008
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1024
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1040
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1056
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1072
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1088
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1104
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 27; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1120
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1136
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1152
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1168
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1184
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1200
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1216
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1232
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1248
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1264
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1280
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1296
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1312
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1328
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1344
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1360
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1376
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1392
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1408
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1424
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1440
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1456
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1472
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1488
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1504
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1520
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1536
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1552
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1568
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1584
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1600
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1616
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1632
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1648
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1664
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1680
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1696
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1712
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1728
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1744
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1760
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1776
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1792
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 43; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1808
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1824
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1840
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1856
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1872
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1888
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 43; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1904
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1920
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1936
+        image: "qtbug-15818.2.png"
+    }
+    Frame {
+        msec: 1952
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 43; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1968
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 1984
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2000
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2016
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2032
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2048
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2064
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 43; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2080
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2096
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2112
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2128
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2144
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2160
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2176
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2192
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2208
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2224
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2240
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2256
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2272
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2288
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2304
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2320
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2336
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2352
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2368
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2384
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2400
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2416
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2432
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2448
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2464
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2480
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2496
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2512
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2528
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2544
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2560
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2576
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2592
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2608
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2624
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2640
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2656
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2672
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2688
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 54; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2704
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2720
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2736
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2752
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2768
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2784
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 55; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2800
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2816
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2832
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2848
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 55; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2864
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2880
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2896
+        image: "qtbug-15818.3.png"
+    }
+    Frame {
+        msec: 2912
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2928
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2944
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2960
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2976
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 55; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2992
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3008
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3024
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3040
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3056
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3072
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3088
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3104
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3120
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3136
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3152
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3168
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3184
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3200
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3216
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3232
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3248
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3264
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3280
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3296
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3312
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3328
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3344
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3360
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3376
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3392
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3408
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3424
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3440
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3456
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3472
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3488
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3504
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3520
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3536
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3552
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3568
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3584
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3600
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3616
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3632
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3648
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3664
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3680
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/qtbug-15818.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/qtbug-15818.qml
new file mode 100644
index 0000000..59710a4
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/qtbug-15818.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.1
+//Test that doubleclicking on the front of a word only selects that word, and not the word in front
+
+Item{
+    width: 200
+    height: 100
+    TextInput{
+        anchors.fill: parent
+        readOnly: true
+        selectByMouse: true
+        text: "abc a cba test"
+    }
+}