Merge branch 'master' into qaction

This commit is contained in:
István Váradi 2018-08-14 17:11:00 +02:00 committed by GitHub
commit 5bcc4ece77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -60,6 +60,10 @@ int ActivityItemDelegate::rowHeight()
QFontMetrics fm(f);
_margin = fm.height() / 2;
#if defined(Q_OS_WIN)
_margin += 5;
#endif
}
return iconHeight() + 5 * _margin;
}