Merge branch '2.0'

2016-01-29 17:22:37 +01:00
parent ecfbf72a57 eb56bd8973
commit 71d4cb781d
30 changed files with 569 additions and 40 deletions
--- a/src/gui/group/GroupModel.cpp
+++ b/src/gui/group/GroupModel.cpp
@@ -136,7 +136,7 @@ QVariant GroupModel::data(const QModelIndex& index, int role) const
            return databaseIcons()->iconPixmap(DatabaseIcons::ExpiredIconIndex);
        }
        else {
-            return group->iconPixmap();
+            return group->iconScaledPixmap();
        }
    }
    else if (role == Qt::FontRole) {