From ae341ca45e85b451f56f2aa699f1ab4d1200c8fc Mon Sep 17 00:00:00 2001 From: Sacha Date: Thu, 26 Jun 2014 17:42:36 +1000 Subject: [PATCH] Qt: RGBA8888 only in Qt5.2+ --- image/png_load.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/png_load.cpp b/image/png_load.cpp index ec4e6da92a..0f461cdfec 100644 --- a/image/png_load.cpp +++ b/image/png_load.cpp @@ -26,7 +26,7 @@ int pngLoad(const char *file, int *pwidth, int *pheight, unsigned char **image_d *pwidth = image.width(); *pheight = image.height(); *image_data_ptr = (unsigned char *)malloc(image.byteCount()); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) image.convertToFormat(QImage::Format_ARGB32); uint32_t *src = (uint32_t*) image.bits(); uint32_t *dest = (uint32_t*) *image_data_ptr;