FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-08-04 19:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gyp_xcode' into dev

Browse Source
This commit is contained in:
John Preston
2016-08-31 16:06:12 -04:00
parent 03b37b85e5 89cbf3a55a
commit c5f4655b9e
65 changed files with 1199 additions and 6990 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/settings.cpp
+9 -3
View File
@@ -136,12 +136,14 @@ bool gAutoPlayGif = true;
void settingsParseArgs(int argc, char *argv[]) {
#ifdef Q_OS_MAC
#ifndef OS_MAC_OLD
if (QSysInfo::macVersion() >= QSysInfo::MV_10_11) {
gIsElCapitan = true;
} else if (QSysInfo::macVersion() < QSysInfo::MV_10_8) {
gPlatform = dbipMacOld;
}
#endif
#else // OS_MAC_OLD
gPlatform = dbipMacOld;
#endif // OS_MAC_OLD
#endif // Q_OS_MAC
switch (cPlatform()) {
case dbipWindows:
@@ -150,7 +152,11 @@ void settingsParseArgs(int argc, char *argv[]) {
break;
case dbipMac:
gUpdateURL = QUrl(qsl("http://tdesktop.com/mac/tupdates/current"));
#ifndef OS_MAC_STORE
gPlatformString = qsl("MacOS");
#else // OS_MAC_STORE
gPlatformString = qsl("MacAppStore");
#endif // OS_MAC_STORE
break;
case dbipMacOld:
gUpdateURL = QUrl(qsl("http://tdesktop.com/mac32/tupdates/current"));