diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-06-19 12:53:25 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-06-20 16:10:30 +0000 |
| commit | 4de40514066e7e31fe02c87afaf0863d6928391f (patch) | |
| tree | a460bdb7c6ce27021ae0a1121721d8c17d1f4c01 | |
| parent | 3d77c3629c2f0f8ff0950577bc5d9dfb938cfbf0 (diff) | |
QPicture: mark deprecated functions with the QT_DEPRECATED macros
These functions should never be used, they've been deprecated
since Qt 5.0.
Change-Id: I71744eba3ff3b94487dd040ddd6af4fb11f382b2
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| -rw-r--r-- | src/gui/image/qpicture.cpp | 2 | ||||
| -rw-r--r-- | src/gui/image/qpicture.h | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 7506e2e1a9..a9c3482209 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1194,6 +1194,7 @@ QT_BEGIN_INCLUDE_NAMESPACE #include "qpictureformatplugin.h" QT_END_INCLUDE_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 0) /*! \obsolete @@ -1279,6 +1280,7 @@ QList<QByteArray> QPicture::outputFormats() { return QPictureIO::outputFormats(); } +#endif // QT_DEPRECATED_SINCE(5, 0) /***************************************************************************** QPictureIO member functions diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index 8da11caee4..2d505d1d06 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.h @@ -90,11 +90,13 @@ public: friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QPicture &p); friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QPicture &p); - static const char* pictureFormat(const QString &fileName); - static QList<QByteArray> inputFormats(); - static QList<QByteArray> outputFormats(); - static QStringList inputFormatList(); - static QStringList outputFormatList(); +#if QT_DEPRECATED_SINCE(5, 0) + 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) QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; |