mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00
Code Issues Releases Wiki Activity

Fixed travis build for TDESKTOP_DISABLE_AUTOUPDATE case.

Browse Source
This commit is contained in:
John Preston
2016-10-18 10:56:38 +03:00
parent 086f754a96
commit fc7c5d0ab3
31 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/app.cpp
View File

@@ -2671,7 +2671,7 @@ namespace {
void setProxySettings(QNetworkAccessManager &manager) {
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
manager.setProxy(getHttpProxySettings());
#endif
#endif // !TDESKTOP_DISABLE_NETWORK_PROXY
}
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
@@ -2687,7 +2687,7 @@ namespace {
}
return QNetworkProxy(QNetworkProxy::DefaultProxy);
}
#endif
#endif // !TDESKTOP_DISABLE_NETWORK_PROXY
void setProxySettings(QTcpSocket &socket) {
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
@@ -2697,7 +2697,7 @@ namespace {
} else {
socket.setProxy(QNetworkProxy(QNetworkProxy::NoProxy));
}
#endif
#endif // !TDESKTOP_DISABLE_NETWORK_PROXY
}
QImage **cornersMask(ImageRoundRadius radius) {