Merge with master

This commit is contained in:
Fabio Bas 2015-08-31 22:55:46 +02:00
parent 5cfb034452
commit 6d7baec37b
9 changed files with 87 additions and 416 deletions

View file

@ -311,7 +311,7 @@ DlgRegister::DlgRegister(QWidget *parent)
countryEdit->setCurrentIndex(0);
QStringList countries = settingsCache->getCountries();
foreach(QString c, countries)
countryEdit->addItem(QPixmap(":/resources/countries/" + c + ".svg"), c);
countryEdit->addItem(QPixmap("theme:countries/" + c.toLower() + ".svg"), c);
realnameLabel = new QLabel(tr("Real name:"));
realnameEdit = new QLineEdit();