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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/widgets/widgets/qlabel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 26dd0e1120..7db7b42ef2 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -339,7 +339,7 @@ void QLabel::setText(const QString &text) if (d->text == text) return; - QTextControl *oldControl = d->control; + QWidgetTextControl *oldControl = d->control; d->control = 0; d->clearContents(); @@ -1599,7 +1599,7 @@ void QLabelPrivate::ensureTextControl() const if (!isTextLabel) return; if (!control) { - control = new QTextControl(const_cast<QLabel *>(q)); + control = new QWidgetTextControl(const_cast<QLabel *>(q)); control->document()->setUndoRedoEnabled(false); control->document()->setDefaultFont(q->font()); control->setTextInteractionFlags(textInteractionFlags); |