1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr608'

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-02 23:41:07 +01:00
commit 2ac1a33cb5
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -125,7 +125,7 @@ void Settings::load()
s.beginGroup("GUI");
enableSmoothAnimation = s.value("smoothAnimation", true).toBool();
smileyPack = s.value("smileyPack", QString()).toString();
smileyPack = s.value("smileyPack", ":/smileys/cylgom/emoticons.xml").toString();
customEmojiFont = s.value("customEmojiFont", true).toBool();
emojiFontFamily = s.value("emojiFontFamily", "DejaVu Sans").toString();
emojiFontPointSize = s.value("emojiFontPointSize", QApplication::font().pointSize()).toInt();