summaryrefslogtreecommitdiffstats
path: root/src/widgets/util/qsystemtrayicon.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-06-27 09:21:59 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-06-27 10:16:09 +0200
commit371d398f70e10408e0eaba7b5f05e638a0048599 (patch)
treedc9a33c4dd8c0f8f0477fdd3a7e0d55cd94c7dfb /src/widgets/util/qsystemtrayicon.cpp
parent48b1322df382503d9b15c6a8e81ec83ac82893a0 (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/util/qsystemtrayicon.cpp')
-rw-r--r--src/widgets/util/qsystemtrayicon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index 28d493248f..f6eeaa02b2 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -474,7 +474,7 @@ QBalloonTip::QBalloonTip(QSystemTrayIcon::MessageIcon icon, const QString& title
msgLabel->setWordWrap(true);
if (msgLabel->sizeHint().width() > limit) {
msgLabel->d_func()->ensureTextControl();
- if (QTextControl *control = msgLabel->d_func()->control) {
+ if (QWidgetTextControl *control = msgLabel->d_func()->control) {
QTextOption opt = control->document()->defaultTextOption();
opt.setWrapMode(QTextOption::WrapAnywhere);
control->document()->setDefaultTextOption(opt);