projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d5cad4e
)
No more posF in Qt 5; use the new localPos
author
Bas Pape
<baspape@gmail.com>
Sat, 20 Apr 2013 12:21:06 +0000
(14:21 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Mon, 24 Mar 2014 23:21:25 +0000
(
00:21
+0100)
src/uisupport/styledlabel.cpp
patch
|
blob
|
history
diff --git
a/src/uisupport/styledlabel.cpp
b/src/uisupport/styledlabel.cpp
index
4aac994
..
e6c0712
100644
(file)
--- 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) {
void StyledLabel::mouseMoveEvent(QMouseEvent *event)
{
if (event->buttons() == Qt::NoButton) {
+#if QT_VERSION < 0x050000
Clickable click = _clickables.atCursorPos(posToCursor(event->posF()));
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
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) {
void StyledLabel::mousePressEvent(QMouseEvent *event)
{
if (event->button() == Qt::LeftButton) {
+#if QT_VERSION < 0x050000
Clickable click = _clickables.atCursorPos(posToCursor(event->posF()));
Clickable click = _clickables.atCursorPos(posToCursor(event->posF()));
+#else
+ Clickable click = _clickables.atCursorPos(posToCursor(event->localPos()));
+#endif
if (click.isValid())
emit clickableActivated(click);
}
if (click.isValid())
emit clickableActivated(click);
}