mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-02 23:45:44 +00:00
Code Issues Releases Wiki Activity

Fix build for Xcode.

Browse Source
This commit is contained in:
John Preston
2018-05-24 19:53:06 +03:00
parent a5cbade8ec
commit 250718e766
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/boxes/send_files_box.cpp
View File

@@ -1323,14 +1323,14 @@ SendFilesBox::SendFilesBox(
const TextWithTags &caption, const TextWithTags &caption,
CompressConfirm compressed) CompressConfirm compressed)
: _list(std::move(list)) : _list(std::move(list))
, _compressConfirmInitial(compressed)
, _compressConfirm(compressed)
, _caption( , _caption(
this, this,
st::confirmCaptionArea, st::confirmCaptionArea,
Ui::InputField::Mode::MultiLine, Ui::InputField::Mode::MultiLine,
FieldPlaceholder(_list), FieldPlaceholder(_list),
caption) caption) {
, _compressConfirmInitial(compressed)
, _compressConfirm(compressed) {
} }
void SendFilesBox::initPreview(rpl::producer<int> desiredPreviewHeight) { void SendFilesBox::initPreview(rpl::producer<int> desiredPreviewHeight) {

2
Telegram/SourceFiles/ui/text/text_entity.cpp
View File

@@ -83,7 +83,9 @@ QRegularExpression CreateRegExp(const QString &expression) {
auto result = QRegularExpression( auto result = QRegularExpression(
expression, expression,
QRegularExpression::UseUnicodePropertiesOption); QRegularExpression::UseUnicodePropertiesOption);
#ifndef OS_MAC_OLD
result.optimize(); result.optimize();
#endif // OS_MAC_OLD
return result; return result;
} }

2
Telegram/SourceFiles/ui/widgets/input_fields.cpp
View File

@@ -648,7 +648,7 @@ public:
Inner(not_null<InputField*> parent) : QTextEdit(parent) { Inner(not_null<InputField*> parent) : QTextEdit(parent) {
} }
QVariant loadResource(int type, const QUrl &name) { QVariant loadResource(int type, const QUrl &name) override {
return outer()->loadResource(type, name); return outer()->loadResource(type, name);
} }