Browse Source

Merge pull request #4090

Diadlo (1):
      fix: Add workaround for FreeBSD and ICU
pull/4065/head
sudden6 9 years ago
parent
commit
f43587f16a
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 9
      src/persistence/smileypack.cpp

9
src/persistence/smileypack.cpp

@ -41,6 +41,10 @@ @@ -41,6 +41,10 @@
#include <QStringBuilder>
#include <QtConcurrent/QtConcurrentRun>
#if defined(Q_OS_FREEBSD)
#include <locale.h>
#endif
#define EMOTICONS_SUB_DIR QStringLiteral("emoticons")
/**
@ -84,6 +88,11 @@ SmileyPack& SmileyPack::getInstance() @@ -84,6 +88,11 @@ SmileyPack& SmileyPack::getInstance()
QStringList SmileyPack::loadDefaultPaths()
{
#if defined(Q_OS_FREEBSD)
// TODO: Remove when will be fixed.
// Workaround to fix https://bugreports.qt.io/browse/QTBUG-57522
setlocale(LC_ALL, "");
#endif
QStringList paths = QStringList{":/smileys", "~/.kde4/share/emoticons", "~/.kde/share/emoticons"};
// qTox should find emoticons next to the binary
paths.append('.' + QDir::separator() + EMOTICONS_SUB_DIR);

Loading…
Cancel
Save