Version 2.4: Fix build on macOS.

This commit is contained in:
John Preston 2020-09-30 19:58:30 +03:00
parent bd1d0417a9
commit d4f2c96322
2 changed files with 3 additions and 3 deletions

View file

@ -152,7 +152,7 @@ ScheduledWidget::ScheduledWidget(
ScheduledWidget::~ScheduledWidget() = default; ScheduledWidget::~ScheduledWidget() = default;
void ScheduledWidget::setupComposeControls() { void ScheduledWidget::setupComposeControls() {
_composeControls->setHistory({ .history = _history }); _composeControls->setHistory({ .history = _history.get() });
_composeControls->height( _composeControls->height(
) | rpl::start_with_next([=] { ) | rpl::start_with_next([=] {

View file

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/platform/mac/base_utilities_mac.h" // Q2NSString() #include "base/platform/mac/base_utilities_mac.h" // Q2NSString()
#include "core/sandbox.h" // Sandbox::customEnterFromEventLoop() #include "core/sandbox.h" // Sandbox::customEnterFromEventLoop()
#include "layout.h" // formatDurationText() #include "ui/text/format_values.h" // Ui::FormatDurationText()
#include "media/audio/media_audio.h" #include "media/audio/media_audio.h"
#include "platform/mac/touchbar/mac_touchbar_common.h" #include "platform/mac/touchbar/mac_touchbar_common.h"
@ -42,7 +42,7 @@ inline NSDictionary *Attributes() {
} }
inline NSString *FormatTime(TimeId time) { inline NSString *FormatTime(TimeId time) {
return Platform::Q2NSString(formatDurationText(time)); return Platform::Q2NSString(Ui::FormatDurationText(time));
} }
} // namespace } // namespace