diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 5faba936f..ef96dc56e 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
+ Version="1.4.7.5" />
Telegram Desktop
Telegram Messenger LLP
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 641e9de37..a7b73891b 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,7,4
- PRODUCTVERSION 1,4,7,4
+ FILEVERSION 1,4,7,5
+ PRODUCTVERSION 1,4,7,5
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop"
- VALUE "FileVersion", "1.4.7.4"
+ VALUE "FileVersion", "1.4.7.5"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.4.7.4"
+ VALUE "ProductVersion", "1.4.7.5"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 5884fd307..377e83e23 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,7,4
- PRODUCTVERSION 1,4,7,4
+ FILEVERSION 1,4,7,5
+ PRODUCTVERSION 1,4,7,5
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop Updater"
- VALUE "FileVersion", "1.4.7.4"
+ VALUE "FileVersion", "1.4.7.5"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.4.7.4"
+ VALUE "ProductVersion", "1.4.7.5"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/codegen/emoji/generator.cpp b/Telegram/SourceFiles/codegen/emoji/generator.cpp
index 1453c41e8..79a6f3f22 100644
--- a/Telegram/SourceFiles/codegen/emoji/generator.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/generator.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include
#include
#include
+#include
#include
#ifdef SUPPORT_IMAGE_GENERATION
@@ -219,6 +220,17 @@ QImage Generator::generateImage(int imageIndex) {
auto sourceSize = kScaleFromLarge ? kLargeEmojiSize : kEmojiSize;
+ const auto fontPath = QStandardPaths::writableLocation(
+ QStandardPaths::DownloadLocation)
+ + "/NotoColorEmoji.ttf";
+ const auto regularId = QFontDatabase::addApplicationFont(fontPath);
+ if (regularId < 0) {
+ return QImage();
+ }
+ for (const auto &family : QFontDatabase::applicationFontFamilies(regularId)) {
+ std::cout << family.toStdString() << std::endl;
+ };
+
auto font = QGuiApplication::font();
font.setFamily(QStringLiteral("Apple Color Emoji"));
font.setPixelSize(kScaleFromLarge ? kLargeEmojiFontSize : kEmojiFontSize);
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 00c67da8e..8e9eaaeee 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (1004007004ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (1004007005ULL)
#ifdef TDESKTOP_OFFICIAL_TARGET
#define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
diff --git a/Telegram/build/version b/Telegram/build/version
index fe80451d3..32be06dc1 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -3,4 +3,4 @@ AppVersionStrMajor 1.4
AppVersionStrSmall 1.4.7
AppVersionStr 1.4.7
BetaChannel 0
-AlphaVersion 1004007004
+AlphaVersion 1004007005