RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-04-25 04:39:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix build in Xcode / GCC.

Browse Source
This commit is contained in:
John Preston 2017-11-19 20:31:58 +04:00
parent f1f955b7ac
commit bc7c88c511
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/info/profile/info_profile_members.h
View File

@ -123,7 +123,7 @@ private:
void updateHeaderControlsGeometry(int newWidth); void updateHeaderControlsGeometry(int newWidth);
void updateSearchEnabledByContent(); void updateSearchEnabledByContent();
Wrap _wrap; //Wrap _wrap;
not_null<Controller*> _controller; not_null<Controller*> _controller;
not_null<PeerData*> _peer; not_null<PeerData*> _peer;
std::unique_ptr<PeerListController> _listController; std::unique_ptr<PeerListController> _listController;

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

@ -337,7 +337,9 @@ MainWindow::Private::~Private() {
MainWindow::MainWindow() MainWindow::MainWindow()
: _private(std::make_unique<Private>(this)) { : _private(std::make_unique<Private>(this)) {
#ifndef OS_MAC_OLD
auto forceOpenGL = std::make_unique<QOpenGLWidget>(this); auto forceOpenGL = std::make_unique<QOpenGLWidget>(this);
#endif // !OS_MAC_OLD
trayImg = st::macTrayIcon.instance(QColor(0, 0, 0, 180), dbisOne); trayImg = st::macTrayIcon.instance(QColor(0, 0, 0, 180), dbisOne);
trayImgSel = st::macTrayIcon.instance(QColor(255, 255, 255), dbisOne); trayImgSel = st::macTrayIcon.instance(QColor(255, 255, 255), dbisOne);

1
Telegram/SourceFiles/stdafx.h
View File

@ -47,6 +47,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#define OS_MAC_OLD #define OS_MAC_OLD
#define RANGES_CXX_THREAD_LOCAL 0
#endif // QT_VERSION < 5.5.0 #endif // QT_VERSION < 5.5.0
#ifdef OS_MAC_STORE #ifdef OS_MAC_STORE