diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-12 13:34:01 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-12 13:40:24 (GMT) |
| commit | 037c1c3b3e1abc07f0570336bd7958121f32848a (patch) | |
| tree | d36de93b4f95b03b462d4064c26587ac4ce5b871 /src/gui/widgets/qlabel_p.h | |
| parent | 65f38e884f40f02be6497819c876013750cce4ea (diff) | |
| download | Qt-037c1c3b3e1abc07f0570336bd7958121f32848a.zip Qt-037c1c3b3e1abc07f0570336bd7958121f32848a.tar.gz Qt-037c1c3b3e1abc07f0570336bd7958121f32848a.tar.bz2 | |
QLabel: Fixed text underlined when te label has a control and the text contains &
We need to search for '&' in the text each time the QTextControl's document
is updated.
Also make sure not to match &&
Task-number: QTBUG-4154
Reviewed-by: Thierry
Diffstat (limited to 'src/gui/widgets/qlabel_p.h')
| -rw-r--r-- | src/gui/widgets/qlabel_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qlabel_p.h b/src/gui/widgets/qlabel_p.h index c5a74e2..ca17a35 100644 --- a/src/gui/widgets/qlabel_p.h +++ b/src/gui/widgets/qlabel_p.h @@ -113,7 +113,7 @@ public: mutable uint hasShortcut : 1; Qt::TextFormat textformat; mutable QTextControl *control; - QTextCursor shortcutCursor; + mutable QTextCursor shortcutCursor; Qt::TextInteractionFlags textInteractionFlags; inline bool needTextControl() const { |