Merge remote-tracking branch 'origin/3.6'

Change-Id: I921bec17ec1756d7f1e930c35d8031d2c8c7e824
This commit is contained in:
Eike Ziller
2015-10-30 16:06:12 +01:00

View File

@@ -73,7 +73,7 @@ static QIcon testTreeIcon(TestTreeItem::Type type)
QIcon(QLatin1String(":/images/func.png")),
QIcon(QLatin1String(":/images/data.png"))
};
if (static_cast<unsigned long>(type) >= sizeof(icons))
if (int(type) >= int(sizeof icons / sizeof *icons))
return icons[2];
return icons[type];
}