diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 471f4d679..9a3229330 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -3340,7 +3340,7 @@ void HistoryContact::updateFrom(const MTPMessageMedia &media) { namespace { QRegularExpression reYouTube1(qsl("^(https?://)?(www\\.|m\\.)?youtube\\.com/watch\\?([^#]+&)?v=([a-z0-9_-]+)(&[^\\s]*)?$"), QRegularExpression::CaseInsensitiveOption); - QRegularExpression reYouTube2(qsl("^(https?://)?(www\\.)?youtu\\.be/([a-z0-9_-]+)([/\\?][^\\s]*)?$"), QRegularExpression::CaseInsensitiveOption); + QRegularExpression reYouTube2(qsl("^(https?://)?(www\\.)?youtu\\.be/([a-z0-9_-]+)([/\\?#][^\\s]*)?$"), QRegularExpression::CaseInsensitiveOption); QRegularExpression reInstagram(qsl("^(https?://)?(www\\.)?instagram\\.com/p/([a-z0-9_-]+)([/\\?][^\\s]*)?$"), QRegularExpression::CaseInsensitiveOption); QRegularExpression reVimeo(qsl("^(https?://)?(www\\.)?vimeo\\.com/([0-9]+)([/\\?][^\\s]*)?$"), QRegularExpression::CaseInsensitiveOption); diff --git a/Telegram/_qt_5_4_0_patch/qtbase/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/Telegram/_qt_5_4_0_patch/qtbase/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 1b0dcfa1b..1683ac87a 100644 --- a/Telegram/_qt_5_4_0_patch/qtbase/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/Telegram/_qt_5_4_0_patch/qtbase/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -341,6 +341,15 @@ static void populateFromPattern(FcPattern *pattern) return; familyName = QString::fromUtf8((const char *)value); + if (familyName == QLatin1String("Open Sans")) { + FcChar8 *styl = 0; + if (FcPatternGetString(pattern, FC_STYLE, 0, &styl) == FcResultMatch) { + QString style = QString::fromUtf8(reinterpret_cast(styl)); + if (style == QLatin1String("Semibold")) { + familyName.append(QChar(QChar::Space)).append(style); + } + } + } slant_value = FC_SLANT_ROMAN; weight_value = FC_WEIGHT_REGULAR; @@ -778,6 +787,15 @@ QStringList QFontconfigDatabase::addApplicationFont(const QByteArray &fontData, FcChar8 *fam = 0; if (FcPatternGetString(pattern, FC_FAMILY, 0, &fam) == FcResultMatch) { QString family = QString::fromUtf8(reinterpret_cast(fam)); + if (family == QLatin1String("Open Sans")) { + FcChar8 *styl = 0; + if (FcPatternGetString(pattern, FC_STYLE, 0, &styl) == FcResultMatch) { + QString style = QString::fromUtf8(reinterpret_cast(styl)); + if (style == QLatin1String("Semibold")) { + family.append(QChar(QChar::Space)).append(style); + } + } + } families << family; } populateFromPattern(pattern);