1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an ABI break caused by too-aggressive deprecation

Browse Source 
Task-number: QTBUG-62516
Change-Id: Ia3b36cddae982cc6fb9f857505be6e38bc8aaa64
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Ville Voutilainen 2017-08-14 20:54:41 +03:00 committed by Simon Hausmann
parent 106d3b9bf9
commit 38db7b1464
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/image/qpicture.cpp
View File

@ -1194,7 +1194,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
#include "qpictureformatplugin.h" #include "qpictureformatplugin.h"
QT_END_INCLUDE_NAMESPACE QT_END_INCLUDE_NAMESPACE
#if QT_DEPRECATED_SINCE(5, 0) #if QT_DEPRECATED_SINCE(5, 10)
/*! /*!
\obsolete \obsolete
@ -1280,7 +1280,7 @@ QList<QByteArray> QPicture::outputFormats()
{ {
return QPictureIO::outputFormats(); return QPictureIO::outputFormats();
} }
#endif // QT_DEPRECATED_SINCE(5, 0) #endif // QT_DEPRECATED_SINCE(5, 10)
/***************************************************************************** /*****************************************************************************
QPictureIO member functions QPictureIO member functions

4
src/gui/image/qpicture.h
View File

@ -90,13 +90,13 @@ public:
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QPicture &p); friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QPicture &p);
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, 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 const char* pictureFormat(const QString &fileName);
static QT_DEPRECATED QList<QByteArray> inputFormats(); static QT_DEPRECATED QList<QByteArray> inputFormats();
static QT_DEPRECATED QList<QByteArray> outputFormats(); static QT_DEPRECATED QList<QByteArray> outputFormats();
static QT_DEPRECATED QStringList inputFormatList(); static QT_DEPRECATED QStringList inputFormatList();
static QT_DEPRECATED QStringList outputFormatList(); static QT_DEPRECATED QStringList outputFormatList();
#endif // QT_DEPRECATED_SINCE(5, 0) #endif // QT_DEPRECATED_SINCE(5, 10)
QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;