diff options
| author | Martin Storsjö <martin@martin.st> | 2020-11-04 11:55:24 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2020-11-05 14:04:55 +0200 |
| commit | 48faa8ed5a34f0780cded4546547cee96fc1dc2f (patch) | |
| tree | 552ce50b06fa3c18365462f456acb67896619e34 /src/gui/image | |
| parent | 66d2bf7659691167f4e4e48a281774e25a887960 (diff) | |
Add _MSC_VER check to MSVC ARM compiler workaround
While _M_ARM is a MSVC specific builtin define, mingw headers do
also define it (in code, as opposed to a compiler built in
define), just as the same headers do for e.g. _M_IX86 and _M_X64.
This avoids warnings about unrecognized pragmas, when compiling
for armv7 mingw.
The original compiler bug (from QTBUG-42038) probably already is
fixed and/or no longer in scope.
Change-Id: I98722e2a7ee1de4f1937a866555ec460f5d898d1
Pick-to: 5.15
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.cpp | 4 | ||||
| -rw-r--r-- | src/gui/image/qimage_p.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index b973b1c6a0..6edf48d3ba 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -181,7 +181,7 @@ QImageData::~QImageData() data = nullptr; } -#if defined(_M_ARM) +#if defined(_M_ARM) && defined(_MSC_VER) #pragma optimize("", off) #endif @@ -311,7 +311,7 @@ bool QImageData::checkForAlphaPixels() const return has_alpha_pixels; } -#if defined(_M_ARM) +#if defined(_M_ARM) && defined(_MSC_VER) #pragma optimize("", on) #endif diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h index 6ca415d187..2fbb646c2e 100644 --- a/src/gui/image/qimage_p.h +++ b/src/gui/image/qimage_p.h @@ -167,7 +167,7 @@ void dither_to_Mono(QImageData *dst, const QImageData *src, Qt::ImageConversionF const uchar *qt_get_bitflip_array(); Q_GUI_EXPORT void qGamma_correct_back_to_linear_cs(QImage *image); -#if defined(_M_ARM) // QTBUG-42038 +#if defined(_M_ARM) && defined(_MSC_VER) // QTBUG-42038 #pragma optimize("", off) #endif inline int qt_depthForFormat(QImage::Format format) @@ -222,7 +222,7 @@ inline int qt_depthForFormat(QImage::Format format) return depth; } -#if defined(_M_ARM) +#if defined(_M_ARM) && defined(_MSC_VER) #pragma optimize("", on) #endif |