mirror of
https://github.com/vale981/tdesktop
synced 2025-03-06 02:01:40 -05:00
Version 1.4.1: Fix build for old OS X.
This commit is contained in:
parent
0e9ad5d82b
commit
fd53385c1f
6 changed files with 5 additions and 17 deletions
|
@ -14,10 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#include <QtCore/QThread>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||
#define OS_MAC_OLD
|
||||
#endif // QT_VERSION < 5.5.0
|
||||
|
||||
#include <crl/crl.h>
|
||||
#include <rpl/rpl.h>
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#include "base/functors.h"
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QtCore/QByteArray>
|
||||
|
||||
#include <string>
|
||||
#include <exception>
|
||||
|
@ -50,7 +51,7 @@ using TimeId = int32;
|
|||
|
||||
// Define specializations for QByteArray for Qt 5.3.2, because
|
||||
// QByteArray in Qt 5.3.2 doesn't declare "pointer" subtype.
|
||||
#ifdef OS_MAC_OLD
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||
namespace gsl {
|
||||
|
||||
template <>
|
||||
|
|
|
@ -17,10 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#include <QtCore/QReadWriteLock>
|
||||
#include <QtCore/QRegularExpression>
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||
#define OS_MAC_OLD
|
||||
#endif // QT_VERSION < 5.5.0
|
||||
|
||||
#include <crl/crl.h>
|
||||
#include <rpl/rpl.h>
|
||||
|
||||
|
|
|
@ -36,10 +36,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#pragma warning(pop)
|
||||
#endif // __clang__ || _MSC_VER >= 1914
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||
#define OS_MAC_OLD
|
||||
#endif // QT_VERSION < 5.5.0
|
||||
|
||||
#ifdef OS_MAC_STORE
|
||||
#define MAC_USE_BREAKPAD
|
||||
#endif // OS_MAC_STORE
|
||||
|
|
|
@ -12,10 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||
#define OS_MAC_OLD
|
||||
#endif // QT_VERSION < 5.5.0
|
||||
|
||||
#include <crl/crl.h>
|
||||
#include <rpl/rpl.h>
|
||||
|
||||
|
|
|
@ -37,6 +37,9 @@
|
|||
},
|
||||
},
|
||||
}], [ 'build_macold', {
|
||||
'defines': [
|
||||
'OS_MAC_OLD',
|
||||
],
|
||||
'xcode_settings': {
|
||||
'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
|
||||
'OTHER_LDFLAGS': [
|
||||
|
|
Loading…
Add table
Reference in a new issue