diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/macextras/qmacfunctions.h | 6 | ||||
| -rw-r--r-- | src/macextras/qmacfunctions.mm | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h index c624d15..cf7cc2a 100644 --- a/src/macextras/qmacfunctions.h +++ b/src/macextras/qmacfunctions.h @@ -66,8 +66,10 @@ class QWindow; namespace QtMac { -Q_MACEXTRAS_EXPORT NSData *toNSData(const QByteArray &data); -Q_MACEXTRAS_EXPORT QByteArray fromNSData(const NSData *data); +#if QT_DEPRECATED_SINCE(5,3) +QT_DEPRECATED Q_MACEXTRAS_EXPORT NSData *toNSData(const QByteArray &data); +QT_DEPRECATED Q_MACEXTRAS_EXPORT QByteArray fromNSData(const NSData *data); +#endif Q_MACEXTRAS_EXPORT CGImageRef toCGImageRef(const QPixmap &pixmap); Q_MACEXTRAS_EXPORT QPixmap fromCGImageRef(CGImageRef image); diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm index 881826a..2a76877 100644 --- a/src/macextras/qmacfunctions.mm +++ b/src/macextras/qmacfunctions.mm @@ -66,6 +66,7 @@ QT_BEGIN_NAMESPACE namespace QtMac { +#if QT_DEPRECATED_SINCE(5,3) /*! \obsolete @@ -88,6 +89,7 @@ QByteArray fromNSData(const NSData *data) [data getBytes:ba.data() length:ba.size()]; return ba; } +#endif // QT_DEPRECATED_SINCE /*! Creates a \c CGImageRef equivalent to the QPixmap. Returns the \c CGImageRef handle. |