diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-04-12 15:47:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-14 06:45:06 +0200 |
| commit | abbb6d3761452d8add4ffd99ba5cb50c51dc7cf7 (patch) | |
| tree | 64fb1a9cf09df044653d3e126151feaab64753f1 | |
| parent | 3d7f132db4f91eccce1987c2860834a0b88d392d (diff) | |
Deprecate QByteArray <=> NSData converters for 5.3
The NSData conversion functions have been moved to QtCore so deprecate
their use in QtMacExtras.
Change-Id: I0e78b32c803a2856366d15302c96014af3ef4c34
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| -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. |