From: Bas Pape Date: Sat, 20 Apr 2013 12:21:06 +0000 (+0200) Subject: No more posF in Qt 5; use the new localPos X-Git-Tag: 0.11.0~74 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=8c0ef4c0ef888da1a1c409c9def063cadbfb707b No more posF in Qt 5; use the new localPos --- diff --git a/src/uisupport/styledlabel.cpp b/src/uisupport/styledlabel.cpp index 4aac9945..e6c0712c 100644 --- a/src/uisupport/styledlabel.cpp +++ b/src/uisupport/styledlabel.cpp @@ -216,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 @@ -243,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); }