Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ivan Lucas 2015-09-10 10:18:14 +01:00
commit 770e9340b3
3 changed files with 75 additions and 56 deletions

View file

@ -221,5 +221,7 @@ void ElidedLabel::mousePressEvent(QMouseEvent *ev)
{
if (mElided && (ev->buttons()==Qt::LeftButton) && (mRectElision.contains(ev->pos()))){
QToolTip::showText(mapToGlobal(QPoint(0, 0)),QString("<FONT>") + mContent + QString("</FONT>"));
return; // eat event
}
QLabel::mousePressEvent(ev);
}