diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2017-08-14 20:54:41 +0300 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-16 15:35:26 +0000 |
| commit | 38db7b1464d098311e7fea3bfb7d4416496823d2 (patch) | |
| tree | 69e73ddbe230e891002801eec5bf9b8055240e93 | |
| parent | 106d3b9bf93325ea93c678270290b2c3dda9b764 (diff) | |
Fix an ABI break caused by too-aggressive deprecation
Task-number: QTBUG-62516
Change-Id: Ia3b36cddae982cc6fb9f857505be6e38bc8aaa64
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/gui/image/qpicture.cpp | 4 | ||||
| -rw-r--r-- | src/gui/image/qpicture.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index a9c3482209..f2c5e250e1 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1194,7 +1194,7 @@ QT_BEGIN_INCLUDE_NAMESPACE #include "qpictureformatplugin.h" QT_END_INCLUDE_NAMESPACE -#if QT_DEPRECATED_SINCE(5, 0) +#if QT_DEPRECATED_SINCE(5, 10) /*! \obsolete @@ -1280,7 +1280,7 @@ QList<QByteArray> QPicture::outputFormats() { return QPictureIO::outputFormats(); } -#endif // QT_DEPRECATED_SINCE(5, 0) +#endif // QT_DEPRECATED_SINCE(5, 10) /***************************************************************************** QPictureIO member functions diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index 2d505d1d06..db2b767efe 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.h @@ -90,13 +90,13 @@ public: friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QPicture &p); friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QPicture &p); -#if QT_DEPRECATED_SINCE(5, 0) +#if QT_DEPRECATED_SINCE(5, 10) static QT_DEPRECATED const char* pictureFormat(const QString &fileName); static QT_DEPRECATED QList<QByteArray> inputFormats(); static QT_DEPRECATED QList<QByteArray> outputFormats(); static QT_DEPRECATED QStringList inputFormatList(); static QT_DEPRECATED QStringList outputFormatList(); -#endif // QT_DEPRECATED_SINCE(5, 0) +#endif // QT_DEPRECATED_SINCE(5, 10) QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; |