summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qurl/tst_qurl.cpp
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2013-09-02 10:12:07 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-21 05:09:41 +0200
commit2b65bba77d4705d49a01a25350de64d153808504 (patch)
tree02de52c8dc6be51af70221beed24a1819cc0dd62 /tests/auto/corelib/io/qurl/tst_qurl.cpp
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 _mac.mm 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 <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests/auto/corelib/io/qurl/tst_qurl.cpp')
-rw-r--r--tests/auto/corelib/io/qurl/tst_qurl.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index e2fa0d3b47..2128d68485 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -87,6 +87,7 @@ private slots:
void toLocalFile();
void fromLocalFile_data();
void fromLocalFile();
+ void macTypes();
void relative();
void compat_legacy();
void compat_constructor_01_data();
@@ -1237,6 +1238,16 @@ void tst_QUrl::fromLocalFile()
QCOMPARE(url.path(), thePath);
}
+void tst_QUrl::macTypes()
+{
+#ifndef Q_OS_MAC
+ QSKIP("This is a Mac-only test");
+#else
+ extern void tst_QUrl_mactypes(); // in tst_qurl_mac.mm
+ void tst_QUrl_mactypes();
+#endif
+}
+
void tst_QUrl::compat_legacy()
{
{