diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-02-28 23:48:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-08 00:21:53 +0100 |
| commit | be81c5884549c3b97ade6e7b97cf75a076d70424 (patch) | |
| tree | 578997ce6e1f63ff6d23a2b163772bab9e15b9aa /tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp | |
| parent | 7625c51ef426b73a8bda5853a4bd2e2d9d3aeb55 (diff) | |
Add Objective-C specific type converters to QByteArray
This patch adds the Objective-C NSData/CDataRef converters to
QByteArray
This will replace the current converters offered in QMacExtras
[ChangeLog][QtCore][Objective-C] Added NSData/CDataRef converters for
QByteArray
Change-Id: I7a0f14bee4271798db345f3c5efd26ac671a3ea4
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index d7cc92e6c0..b06741b23e 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -151,6 +151,8 @@ private slots: #if defined(Q_COMPILER_LAMBDA) void literals(); #endif + + void macTypes(); }; static const struct StaticByteArrays { @@ -1980,6 +1982,16 @@ void tst_QByteArray::literals() } #endif +void tst_QByteArray::macTypes() +{ +#ifndef Q_OS_MAC + QSKIP("This is a Apple-only test"); +#else + extern void tst_QByteArray_macTypes(); // in qbytearray_mac.mm + tst_QByteArray_macTypes(); +#endif +} + const char globalChar = '1'; QTEST_MAIN(tst_QByteArray) |