summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@gmail.com>2019-11-12 17:59:51 +0100
committerCristian Adam <cristian.adam@gmail.com>2019-11-14 17:50:49 +0100
commit80ac9e8b7ce8e3f79af0b00610a0a4b0ff17abe4 (patch)
tree7be9d4dc6937136bb75225281b5350901a12f88b /src/gui/image
parentad11cab4842a4d35fe80641ae3eec7f2d8817652 (diff)
Compile fix for MinGW 8.1.0
Workaround for libpng bug in GCC 8.1.0. Task-number: QTQAINFRA-3303 Change-Id: Id7668e795cb4ab16de3199fc3727d844aa31bfad Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/image.pri8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 3b2ced3f58..1f42f28d1e 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -79,6 +79,14 @@ qtConfig(png) {
HEADERS += image/qpnghandler_p.h
SOURCES += image/qpnghandler.cpp
QMAKE_USE_PRIVATE += libpng
+
+ win32:mingw {
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86048
+ GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}"
+ equals(GCC_VERSION, "8.1.0") {
+ QMAKE_CXXFLAGS += -fno-reorder-blocks-and-partition
+ }
+ }
}
# SIMD