procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix build for old OS X versions.

This commit is contained in:
John Preston 2019-06-23 10:21:06 +02:00
parent 29532f8232
commit 8a7980ca7b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/codegen/lang/generator.cpp
View File

@ -209,7 +209,7 @@ using S = std::decay_t<decltype(std::declval<P>()(QString()))>;\n\
template <typename ...Tags>\n\ template <typename ...Tags>\n\
struct phrase;\n\ struct phrase;\n\
\n"; \n";
std::set<QStringList> producersDeclared; std::set<QString> producersDeclared;
for (auto &entry : langpack_.entries) { for (auto &entry : langpack_.entries) {
const auto isPlural = !entry.keyBase.isEmpty(); const auto isPlural = !entry.keyBase.isEmpty();
const auto &key = entry.key; const auto &key = entry.key;
@ -238,7 +238,7 @@ struct phrase;\n\
} }
producerArgs.push_back("P p = P()"); producerArgs.push_back("P p = P()");
currentArgs.push_back("P p = P()"); currentArgs.push_back("P p = P()");
if (!producersDeclared.emplace(tags).second) { if (!producersDeclared.emplace(tags.join(',')).second) {
continue; continue;
} }
header_->stream() << "\ header_->stream() << "\

2
Telegram/SourceFiles/platform/mac/mac_touchbar.mm
View File

@ -136,12 +136,14 @@ NSImage *CreateNSImageFromEmoji(EmojiPtr emoji) {
pixmap.fill(Qt::black); pixmap.fill(Qt::black);
Painter paint(&pixmap); Painter paint(&pixmap);
PainterHighQualityEnabler hq(paint); PainterHighQualityEnabler hq(paint);
#ifndef OS_MAC_OLD
Ui::Emoji::Draw( Ui::Emoji::Draw(
paint, paint,
std::move(emoji), std::move(emoji),
Ui::Emoji::GetSizeTouchbar(), Ui::Emoji::GetSizeTouchbar(),
0, 0,
0); 0);
#endif // OS_MAC_OLD
return [qt_mac_create_nsimage(pixmap) autorelease]; return [qt_mac_create_nsimage(pixmap) autorelease];
} }