From 250718e766c9a0e02717bb5d11af46e7931920a7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 24 May 2018 19:53:06 +0300 Subject: [PATCH] Fix build for Xcode. --- Telegram/SourceFiles/boxes/send_files_box.cpp | 6 +++--- Telegram/SourceFiles/ui/text/text_entity.cpp | 2 ++ Telegram/SourceFiles/ui/widgets/input_fields.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp index 1782befac..48a42e239 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp @@ -1323,14 +1323,14 @@ SendFilesBox::SendFilesBox( const TextWithTags &caption, CompressConfirm compressed) : _list(std::move(list)) +, _compressConfirmInitial(compressed) +, _compressConfirm(compressed) , _caption( this, st::confirmCaptionArea, Ui::InputField::Mode::MultiLine, FieldPlaceholder(_list), - caption) -, _compressConfirmInitial(compressed) -, _compressConfirm(compressed) { + caption) { } void SendFilesBox::initPreview(rpl::producer desiredPreviewHeight) { diff --git a/Telegram/SourceFiles/ui/text/text_entity.cpp b/Telegram/SourceFiles/ui/text/text_entity.cpp index 0b8a9f810..2dcf33107 100644 --- a/Telegram/SourceFiles/ui/text/text_entity.cpp +++ b/Telegram/SourceFiles/ui/text/text_entity.cpp @@ -83,7 +83,9 @@ QRegularExpression CreateRegExp(const QString &expression) { auto result = QRegularExpression( expression, QRegularExpression::UseUnicodePropertiesOption); +#ifndef OS_MAC_OLD result.optimize(); +#endif // OS_MAC_OLD return result; } diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.cpp b/Telegram/SourceFiles/ui/widgets/input_fields.cpp index 069f01953..40c51aabc 100644 --- a/Telegram/SourceFiles/ui/widgets/input_fields.cpp +++ b/Telegram/SourceFiles/ui/widgets/input_fields.cpp @@ -648,7 +648,7 @@ public: Inner(not_null parent) : QTextEdit(parent) { } - QVariant loadResource(int type, const QUrl &name) { + QVariant loadResource(int type, const QUrl &name) override { return outer()->loadResource(type, name); }