Merge remote-tracking branch 'origin/master' into jo-remove-name-filters-from-settings

This commit is contained in:
Gavin Bises 2015-02-04 20:15:41 -05:00
commit 6e5f4d1f06
42 changed files with 720 additions and 222 deletions

View file

@ -115,7 +115,7 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
case Qt::DisplayRole:
return QString::fromStdString(g.creator_info().name());
case Qt::DecorationRole: {
QPixmap avatarPixmap = UserLevelPixmapGenerator::generatePixmap(13, (UserLevelFlags)g.creator_info().user_level());
QPixmap avatarPixmap = UserLevelPixmapGenerator::generatePixmap(13, (UserLevelFlags)g.creator_info().user_level(), false);
return QIcon(avatarPixmap);
}
default: