diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bc1f36..ac6515a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,11 +223,7 @@ set(PROJECT_SOURCES ) if (NOT APPLE AND Qt6_VERSION VERSION_GREATER_EQUAL 6.9.0) - if (WIN32) - list(APPEND PROJECT_SOURCES res/EmojiFontWin.qrc) - else () - list(APPEND PROJECT_SOURCES res/EmojiFontLin.qrc) - endif () + list(APPEND PROJECT_SOURCES res/EmojiFont.qrc) endif () # Qt exe diff --git a/res/EmojiFont.qrc b/res/EmojiFont.qrc new file mode 100644 index 0000000..a56ba94 --- /dev/null +++ b/res/EmojiFont.qrc @@ -0,0 +1,5 @@ + + + font/NotoColorEmoji.ttf + + diff --git a/res/EmojiFontLin.qrc b/res/EmojiFontLin.qrc deleted file mode 100644 index f8daaba..0000000 --- a/res/EmojiFontLin.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - font/TwemojiMozilla.ttf - - diff --git a/res/EmojiFontWin.qrc b/res/EmojiFontWin.qrc deleted file mode 100644 index 93124a4..0000000 --- a/res/EmojiFontWin.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - font/seguiemj.ttf - - diff --git a/res/font/NotoColorEmoji.ttf b/res/font/NotoColorEmoji.ttf new file mode 100644 index 0000000..943741d Binary files /dev/null and b/res/font/NotoColorEmoji.ttf differ diff --git a/res/font/TwemojiMozilla.ttf b/res/font/TwemojiMozilla.ttf deleted file mode 100644 index 25cfdb4..0000000 Binary files a/res/font/TwemojiMozilla.ttf and /dev/null differ diff --git a/res/font/seguiemj.ttf b/res/font/seguiemj.ttf deleted file mode 100644 index f54d916..0000000 Binary files a/res/font/seguiemj.ttf and /dev/null differ diff --git a/src/main.cpp b/src/main.cpp index ad666f1..5aa0a88 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -71,14 +71,14 @@ int main(int argc, char* argv[]) { #if !defined(Q_OS_MACOS) && (QT_VERSION >= QT_VERSION_CHECK(6,9,0)) // Load the emoji fonts - int fontId = QFontDatabase::addApplicationFont(":/font/emojiFont"); + int fontId = QFontDatabase::addApplicationFont(":/font/notoEmoji"); if (fontId >= 0) { QStringList fontFamilies = QFontDatabase::applicationFontFamilies(fontId); QFontDatabase::setApplicationEmojiFontFamilies(fontFamilies); } else { - qDebug() << "could not load emoji font!"; + qDebug() << "could not load noto font!"; } #endif