Fix merge & relative path for portable build

This commit is contained in:
marco 2015-08-25 20:09:01 +02:00
commit 4125d690fa
33 changed files with 1556 additions and 581 deletions

View file

@ -34,7 +34,7 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, int gender, QString cou
foreach(QString c, countries)
{
countryEdit->addItem(QPixmap(":/resources/countries/" + c + ".svg"), c);
if(c == country)
if (c == country)
countryEdit->setCurrentIndex(i);
++i;