1 files changed, 13 insertions, 25 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 55b8690c77..8984af12d1 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -106,20 +106,16 @@ public:
         Format_RGBX8888,
         Format_RGBA8888,
         Format_RGBA8888_Premultiplied,
-#if 0
-        // reserved for future use
-        Format_RGB15,
-        Format_Grayscale16,
-        Format_Grayscale8,
-        Format_Grayscale4,
-        Format_Grayscale4LSB,
-        Format_Grayscale2,
-        Format_Grayscale2LSB
-#endif
         Format_BGR30,
         Format_A2BGR30_Premultiplied,
         Format_RGB30,
         Format_A2RGB30_Premultiplied,
+        Format_Alpha8,
+        Format_Grayscale8,
+#if 0
+        // reserved for future use
+        Format_Grayscale16,
+#endif
 #ifndef Q_QDOC
         NImageFormats
 #endif
@@ -155,7 +151,7 @@ public:
 
     bool isNull() const;
 
-    int devType() const;
+    int devType() const Q_DECL_OVERRIDE;
 
     bool operator==(const QImage &) const;
     bool operator!=(const QImage &) const;
@@ -288,7 +284,7 @@ public:
 #endif
     qint64 cacheKey() const;
 
-    QPaintEngine *paintEngine() const;
+    QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
 
     // Auxiliary data
     int dotsPerMeterX() const;
@@ -321,7 +317,7 @@ public:
 #endif
 
 protected:
-    virtual int metric(PaintDeviceMetric metric) const;
+    virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE;
     QImage mirrored_helper(bool horizontal, bool vertical) const;
     QImage rgbSwapped_helper() const;
     void mirrored_inplace(bool horizontal, bool vertical);
@@ -353,13 +349,9 @@ inline void QImage::setPixel(const QPoint &pt, uint index_or_rgb) { setPixel(pt.
 
 #if QT_DEPRECATED_SINCE(5, 0)
 
-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(Q_CC_MSVC)
-# pragma warning(push)
-# pragma warning(disable: 4996)
-#endif
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations")
+QT_WARNING_DISABLE_MSVC(4996)
 
 inline QString QImage::text(const char* key, const char* lang) const
 {
@@ -431,11 +423,7 @@ inline void QImage::setText(const char* key, const char* lang, const QString &s)
     setText(k, s);
 }
 
-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
-# pragma GCC diagnostic pop
-#elif defined(Q_CC_MSVC)
-# pragma warning(pop)
-#endif
+QT_WARNING_POP
 
 inline int QImage::numColors() const
 {