diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-13 00:41:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 00:41:58 +0200 |
| commit | d54d28981c90d23d7fa0cfc5a9e3049e3e4df6b5 (patch) | |
| tree | 0eb2f54f16b014f6eaa362095393d1bd058adb52 /src/quick/items/qquicktext.cpp | |
| parent | 580f2872f09cf7ad83ec9ae5dca686683a3cac80 (diff) | |
| parent | 6f15de1d2da9c83d7fca1d5c8243c0d69a1390ee (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4ssa_p.h
tests/benchmarks/qml/qqmlimage/qqmlimage.pro
tests/benchmarks/qml/qqmlimage/tst_qqmlimage.cpp
Change-Id: Iad11ce7fdf0c6d200fdebc16a94081bd8069a87a
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 59331647e5..8288554028 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2028,6 +2028,7 @@ void QQuickText::setTextFormat(TextFormat format) } d->updateLayout(); setAcceptHoverEvents(d->richText || d->styledText); + setAcceptedMouseButtons(d->richText || d->styledText ? Qt::LeftButton : Qt::NoButton); emit textFormatChanged(d->format); } |