2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-04 00:15:42 +00:00

Merge branch 'gyp_xcode' into dev

This commit is contained in:
John Preston
2016-08-31 16:06:12 -04:00
65 changed files with 1199 additions and 6990 deletions

View File

@@ -6041,9 +6041,9 @@ void LocationManager::onFinished(QNetworkReply *reply) {
{
QBuffer buffer(&data);
QImageReader reader(&buffer);
#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
#ifndef OS_MAC_OLD
reader.setAutoTransform(true);
#endif
#endif // OS_MAC_OLD
thumb = QPixmap::fromImageReader(&reader, Qt::ColorOnly);
format = reader.format();
thumb.setDevicePixelRatio(cRetinaFactor());