projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Qt::escape moved to QString::toHtmlEscaped in Qt 5
[quassel.git]
/
src
/
uisupport
/
styledlabel.cpp
diff --git
a/src/uisupport/styledlabel.cpp
b/src/uisupport/styledlabel.cpp
index
af294c4
..
4aac994
100644
(file)
--- a/
src/uisupport/styledlabel.cpp
+++ b/
src/uisupport/styledlabel.cpp
@@
-156,7
+156,11
@@
void StyledLabel::setText(const QString &text)
void StyledLabel::updateToolTip()
{
if (frameRect().width() - 2*frameWidth() < _layout.minimumWidth())
void StyledLabel::updateToolTip()
{
if (frameRect().width() - 2*frameWidth() < _layout.minimumWidth())
+#if QT_VERSION < 0x050000
setToolTip(QString("<qt>%1</qt>").arg(Qt::escape(_layout.text()))); // only rich text gets wordwrapped!
setToolTip(QString("<qt>%1</qt>").arg(Qt::escape(_layout.text()))); // only rich text gets wordwrapped!
+#else
+ setToolTip(QString("<qt>%1</qt>").arg(_layout.text().toHtmlEscaped())); // only rich text gets wordwrapped!
+#endif
else
setToolTip(QString());
}
else
setToolTip(QString());
}