diff options
Diffstat (limited to 'src/gui/image/qpicture.cpp')
-rw-r--r-- | src/gui/image/qpicture.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 010f5ecf67..7aa221948e 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -456,8 +456,8 @@ public: QFakeDevice() { dpi_x = qt_defaultDpiX(); dpi_y = qt_defaultDpiY(); } void setDpiX(int dpi) { dpi_x = dpi; } void setDpiY(int dpi) { dpi_y = dpi; } - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE { return 0; } - int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE + QPaintEngine *paintEngine() const override { return 0; } + int metric(PaintDeviceMetric m) const override { switch(m) { case PdmPhysicalDpiX: @@ -1194,6 +1194,7 @@ QT_BEGIN_INCLUDE_NAMESPACE #include "qpictureformatplugin.h" QT_END_INCLUDE_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 10) /*! \obsolete @@ -1284,6 +1285,7 @@ QList<QByteArray> QPicture::outputFormats() { return QPictureIO::outputFormats(); } +#endif // QT_DEPRECATED_SINCE(5, 10) /***************************************************************************** QPictureIO member functions |