2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-02 07:35:12 +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

@@ -3623,9 +3623,9 @@ namespace Local {
QImage img;
QBuffer buf(&pngData);
QImageReader reader(&buf);
#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
#ifndef OS_MAC_OLD
reader.setAutoTransform(true);
#endif
#endif // OS_MAC_OLD
if (reader.read(&img)) {
App::initBackground(id, img, true);
return true;