diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 10:24:14 +0200 |
| commit | 6adf5052d40eeebe1d749d8c440e4883a81b3935 (patch) | |
| tree | 5ab987b6c73633925e924c36e6fe146a07f0a074 /src/quick/items/qquicktextcontrol_p_p.h | |
| parent | 5ca1d2e0b2912e578a32c5e11b4fd1d7a0ef28f3 (diff) | |
| parent | c80eb38354854f2ccc7ea070a9857409acc36792 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/quick/items/qquicktextcontrol_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextcontrol_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextcontrol_p_p.h b/src/quick/items/qquicktextcontrol_p_p.h index 5648c31e21..d52200b49d 100644 --- a/src/quick/items/qquicktextcontrol_p_p.h +++ b/src/quick/items/qquicktextcontrol_p_p.h @@ -143,7 +143,7 @@ public: QTextBlock blockWithMarkerUnderMousePress; QBasicTimer cursorBlinkTimer; - QBasicTimer tripleClickTimer; + ulong timestampAtLastDoubleClick = 0; // will only be set at a double click #if QT_CONFIG(im) int preeditCursor; |