Merge branch 'master' into rename_client

This commit is contained in:
Daniel Molkentin 2014-12-02 14:33:28 +01:00
commit b7323dc403

View file

@ -63,7 +63,7 @@ SettingsDialogMac::SettingsDialogMac(ownCloudGui *gui, QWidget *parent)
setWindowTitle(tr("%1").arg(Theme::instance()->appNameGUI()));
_accountSettings = new AccountSettings;
QIcon accountIcon = (QLatin1String(":/mirall/resources/accounts.png"));
QIcon accountIcon(QLatin1String(":/mirall/resources/accounts.png"));
addPreferencesPanel(accountIcon, tr("Account"), _accountSettings);
QIcon protocolIcon(QLatin1String(":/mirall/resources/activity.png"));