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 /src/corelib/tools/tools.pri | |
| 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 'src/corelib/tools/tools.pri')
| -rw-r--r-- | src/corelib/tools/tools.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 1e4a503778..7a3dc9470c 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -127,7 +127,8 @@ false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator SOURCES += tools/qelapsedtimer_mac.cpp OBJECTIVE_SOURCES += tools/qlocale_mac.mm \ tools/qtimezoneprivate_mac.mm \ - tools/qstring_mac.mm + tools/qstring_mac.mm \ + tools/qbytearray_mac.mm } else:blackberry { SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_blackberry.cpp tools/qtimezoneprivate_tz.cpp |