path: root/src/corelib/tools/tools.pri
diff options
authorMorten Johan Sørvig <>2013-09-02 10:12:07 +0200
committerThe Qt Project <>2013-09-21 05:09:41 +0200
commit2b65bba77d4705d49a01a25350de64d153808504 (patch)
tree02de52c8dc6be51af70221beed24a1819cc0dd62 /src/corelib/tools/tools.pri
parentdd7bfffa77c231296ca977d6c7d487962f7ebae9 (diff)
Add Mac type conversion functions to QtCore
New API: static QString QString::fromCFString(CFStringRef string); CFStringRef QString::toCFString() const; static QString QString::fromNSString(const NSString *string); NSString *QString::toNSString() const; static QUrl QUrl::fromCFURL(CFURLRef url); CFURLRef QUrl::toCFURL() const; static QUrl QUrl::fromNSURL(const NSURL *url); NSURL * QUrl::toNSURL() const; Add Q_OS_MAC-protected function declarations to header files, add implementation to _mm files. CF and NS types are forward-declared in the header files to avoid including the CoreFoundation and Foundation headers. This prevents accidental use of native types in application code. Add helper macros for forward- declaration to qglobal.h Add cf_returns_retained/ns_returns_autoreleased attributes to toCFString() and toNSURL(). These attributes assists the clang static analyzer. Add Q_DECL_ helper macros to qcompilerdetection.h. Add test functions (in files) to the QString and QUrl tests. Split out the test class declarations into a separate headers files. Change-Id: I60fd5e93f042316196284c3db0595835fe8c4ad4 Reviewed-by: Gabriel de Dietrich <>
Diffstat (limited to 'src/corelib/tools/tools.pri')
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 318f84d78e..1f8641c312 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -110,7 +110,8 @@ SOURCES += \
!nacl:mac: {
SOURCES += tools/qelapsedtimer_mac.cpp
+ tools/
else:blackberry {
SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_blackberry.cpp