Since Qt 5.7 Qt is no longer able to display "Segoe UI Emoji" in color

So we always use "Segoe UI Symbol"
This commit is contained in:
Hannah von Reth 2017-01-20 10:16:47 +01:00
parent a513c24f09
commit e2e3b72723
1 changed files with 8 additions and 8 deletions

View File

@ -35,18 +35,18 @@ NotifyWidget::NotifyWidget(int id, const ::SnorePlugin::Snore *parent) :
{ {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#if QT_VERSION < QT_VERSION_CHECK(5,7,0)// Qt 5.7+ is broken and can only display it in black and white. //#if QT_VERSION < QT_VERSION_CHECK(5,7,0)// Qt 5.7+ is broken and can only display it in black and white.
if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS8) { if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS8) {
m_fontFamily = QStringLiteral("Segoe UI Symbol"); m_fontFamily = QStringLiteral("Segoe UI Symbol");
emit fontFamilyChanged(); emit fontFamilyChanged();
} }
#if QT_VERSION >= QT_VERSION_CHECK(5,5,0) //#if QT_VERSION >= QT_VERSION_CHECK(5,5,0)
if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10) { // if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10) {
m_fontFamily = QStringLiteral("Segoe UI Emoji"); // m_fontFamily = QStringLiteral("Segoe UI Emoji");
emit fontFamilyChanged(); // emit fontFamilyChanged();
} // }
#endif //#endif
#endif //#endif
#endif #endif
QQmlApplicationEngine *engine = new QQmlApplicationEngine(this); QQmlApplicationEngine *engine = new QQmlApplicationEngine(this);
engine->rootContext()->setContextProperty(QStringLiteral("notifyWidget"), this); engine->rootContext()->setContextProperty(QStringLiteral("notifyWidget"), this);