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

Fixed build for OS X 10.6 and 10.7 on Qt 5.3 and libstdc++.

Browse Source
This commit is contained in:
John Preston 2016-09-15 14:08:45 +03:00
parent 708bf688ea
commit c00456e12e
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/history.cpp
View File

@ -5896,7 +5896,9 @@ void LocationManager::init() {
App::setProxySettings(*manager);
connect(manager, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), this, SLOT(onFailed(QNetworkReply*)));
#ifndef OS_MAC_OLD
connect(manager, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)), this, SLOT(onFailed(QNetworkReply*)));
#endif // OS_MAC_OLD
connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(onFinished(QNetworkReply*)));
if (black) {

8
Telegram/SourceFiles/mediaview.cpp
View File

@ -1890,7 +1890,11 @@ void MediaView::keyPressEvent(QKeyEvent *e) {
}
void MediaView::wheelEvent(QWheelEvent *e) {
#ifdef OS_MAC_OLD
constexpr auto step = 120;
#else // OS_MAC_OLD
constexpr auto step = static_cast<int>(QWheelEvent::DefaultDeltasPerStep);
#endif // OS_MAC_OLD
_verticalWheelDelta += e->angleDelta().y();
while (qAbs(_verticalWheelDelta) >= step) {
@ -1899,18 +1903,22 @@ void MediaView::wheelEvent(QWheelEvent *e) {
if (e->modifiers().testFlag(Qt::ControlModifier)) {
zoomOut();
} else {
#ifndef OS_MAC_OLD
if (e->source() == Qt::MouseEventNotSynthesized) {
moveToNext(1);
}
#endif // OS_MAC_OLD
}
} else {
_verticalWheelDelta -= step;
if (e->modifiers().testFlag(Qt::ControlModifier)) {
zoomIn();
} else {
#ifndef OS_MAC_OLD
if (e->source() == Qt::MouseEventNotSynthesized) {
moveToNext(-1);
}
#endif // OS_MAC_OLD
}
}
}

4
Telegram/SourceFiles/mtproto/file_download.cpp
View File

@ -818,7 +818,9 @@ WebLoadManager::WebLoadManager(QThread *thread) {
connect(this, SIGNAL(error(webFileLoader*)), _webLoadMainManager, SLOT(error(webFileLoader*)));
connect(&_manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), this, SLOT(onFailed(QNetworkReply*)));
#ifndef OS_MAC_OLD
connect(&_manager, SIGNAL(sslErrors(QNetworkReply*,const QList<QSslError>&)), this, SLOT(onFailed(QNetworkReply*)));
#endif // OS_MAC_OLD
}
void WebLoadManager::append(webFileLoader *loader, const QString &url) {
@ -1108,4 +1110,4 @@ void notifyImageLoaded() {
}
} // namespace internal
}
}