diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-27 09:21:59 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-06-27 10:16:09 +0200 |
| commit | 371d398f70e10408e0eaba7b5f05e638a0048599 (patch) | |
| tree | dc9a33c4dd8c0f8f0477fdd3a7e0d55cd94c7dfb /src/widgets/widgets/qlabel_p.h | |
| parent | 48b1322df382503d9b15c6a8e81ec83ac82893a0 (diff) | |
Renamed QLine/TextControl to QWidgetLine/TextControl
Renamed them to free up the QTextControl and QLineControl
class names for a new API in QtGui.
Reviewed-by: Jørgen Lind
Diffstat (limited to 'src/widgets/widgets/qlabel_p.h')
| -rw-r--r-- | src/widgets/widgets/qlabel_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qlabel_p.h b/src/widgets/widgets/qlabel_p.h index 000fcd2fec..b6f2db6a25 100644 --- a/src/widgets/widgets/qlabel_p.h +++ b/src/widgets/widgets/qlabel_p.h @@ -56,7 +56,7 @@ #include "qlabel.h" #include "private/qtextdocumentlayout_p.h" -#include "private/qtextcontrol_p.h" +#include "private/qwidgettextcontrol_p.h" #include "qtextdocumentfragment.h" #include "qframe_p.h" #include "qtextdocument.h" @@ -112,7 +112,7 @@ public: mutable uint isTextLabel : 1; mutable uint hasShortcut : 1; Qt::TextFormat textformat; - mutable QTextControl *control; + mutable QWidgetTextControl *control; mutable QTextCursor shortcutCursor; Qt::TextInteractionFlags textInteractionFlags; |