From 698ba297d385fa8cd4d0876a6f3941c28e4d308f Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 27 Mar 2018 08:01:04 +0200 Subject: [PATCH] We depend against 5.8.0 now --- src/imageformats/tga.cpp | 6 ------ src/imageformats/xcf.cpp | 4 ---- 2 files changed, 10 deletions(-) diff --git a/src/imageformats/tga.cpp b/src/imageformats/tga.cpp index 49199db..3a22b45 100644 --- a/src/imageformats/tga.cpp +++ b/src/imageformats/tga.cpp @@ -145,9 +145,7 @@ struct TgaHeaderInfo { switch (tga.image_type) { case TGA_TYPE_RLE_INDEXED: rle = true; -#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) Q_FALLTHROUGH(); -#endif // no break is intended! case TGA_TYPE_INDEXED: pal = true; @@ -155,9 +153,7 @@ struct TgaHeaderInfo { case TGA_TYPE_RLE_RGB: rle = true; -#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) Q_FALLTHROUGH(); -#endif // no break is intended! case TGA_TYPE_RGB: rgb = true; @@ -165,9 +161,7 @@ struct TgaHeaderInfo { case TGA_TYPE_RLE_GREY: rle = true; -#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) Q_FALLTHROUGH(); -#endif // no break is intended! case TGA_TYPE_GREY: grey = true; diff --git a/src/imageformats/xcf.cpp b/src/imageformats/xcf.cpp index 485be91..f07a43b 100644 --- a/src/imageformats/xcf.cpp +++ b/src/imageformats/xcf.cpp @@ -1323,9 +1323,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image) image.fill(qRgb(255, 255, 255)); break; } // else, fall through to 32-bit representation -#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) Q_FALLTHROUGH(); -#endif case RGBA_GIMAGE: image = QImage(xcf_image.width, xcf_image.height, QImage::Format_ARGB32); if (image.isNull()) { @@ -1345,9 +1343,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image) image.fill(255); break; } // else, fall through to 32-bit representation -#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) Q_FALLTHROUGH(); -#endif case GRAYA_GIMAGE: image = QImage(xcf_image.width, xcf_image.height, QImage::Format_ARGB32); if (image.isNull()) {