X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fstyledlabel.cpp;h=dc13660e9f4cda388c34735ebfecaddbe53186aa;hb=0ba56e60f400621ddc291669dc2c03a8e461c224;hp=4aae71a095e482a5753dc29b8e9bb8ad6af0b1de;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222;p=quassel.git

diff --git a/src/uisupport/styledlabel.cpp b/src/uisupport/styledlabel.cpp
index 4aae71a0..dc13660e 100644
--- a/src/uisupport/styledlabel.cpp
+++ b/src/uisupport/styledlabel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -156,7 +156,11 @@ void StyledLabel::setText(const QString &text)
 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!
+#else
+        setToolTip(QString("<qt>%1</qt>").arg(_layout.text().toHtmlEscaped()));  // only rich text gets wordwrapped!
+#endif
     else
         setToolTip(QString());
 }
@@ -212,7 +216,11 @@ int StyledLabel::posToCursor(const QPointF &pos)
 void StyledLabel::mouseMoveEvent(QMouseEvent *event)
 {
     if (event->buttons() == Qt::NoButton) {
+#if QT_VERSION < 0x050000
         Clickable click = _clickables.atCursorPos(posToCursor(event->posF()));
+#else
+        Clickable click = _clickables.atCursorPos(posToCursor(event->localPos()));
+#endif
         if (click.isValid())
             setHoverMode(click.start(), click.length());
         else
@@ -239,7 +247,11 @@ void StyledLabel::leaveEvent(QEvent *)
 void StyledLabel::mousePressEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
+#if QT_VERSION < 0x050000
         Clickable click = _clickables.atCursorPos(posToCursor(event->posF()));
+#else
+        Clickable click = _clickables.atCursorPos(posToCursor(event->localPos()));
+#endif
         if (click.isValid())
             emit clickableActivated(click);
     }