Fix build in Xcode / GCC.

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

View File

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

View File

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

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)
#define OS_MAC_OLD
#define RANGES_CXX_THREAD_LOCAL 0
#endif // QT_VERSION < 5.5.0
#ifdef OS_MAC_STORE