diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-09-02 10:12:07 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-21 05:09:41 +0200 |
commit | 2b65bba77d4705d49a01a25350de64d153808504 (patch) | |
tree | 02de52c8dc6be51af70221beed24a1819cc0dd62 /tests/auto/corelib/io | |
parent | dd7bfffa77c231296ca977d6c7d487962f7ebae9 (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')
-rw-r--r-- | tests/auto/corelib/io/qurl/qurl.pro | 2 | ||||
-rw-r--r-- | tests/auto/corelib/io/qurl/tst_qurl.cpp | 11 | ||||
-rw-r--r-- | tests/auto/corelib/io/qurl/tst_qurl_mac.mm | 63 |
3 files changed, 76 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qurl/qurl.pro b/tests/auto/corelib/io/qurl/qurl.pro index a5e7130505..f65a9c688c 100644 --- a/tests/auto/corelib/io/qurl/qurl.pro +++ b/tests/auto/corelib/io/qurl/qurl.pro @@ -3,3 +3,5 @@ TARGET = tst_qurl QT = core testlib concurrent SOURCES = tst_qurl.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +mac: OBJECTIVE_SOURCES += tst_qurl_mac.mm 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() { { diff --git a/tests/auto/corelib/io/qurl/tst_qurl_mac.mm b/tests/auto/corelib/io/qurl/tst_qurl_mac.mm new file mode 100644 index 0000000000..90b01a261b --- /dev/null +++ b/tests/auto/corelib/io/qurl/tst_qurl_mac.mm @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <CoreFoundation/CoreFoundation.h> +#include <Foundation/Foundation.h> + +void tst_QUrl_macTypes() +{ + { + QUrl qtUrl("example.com"); + const CFURLRef cfUrl = qtUrl.toCFURL(); + QCOMPARE(QUrl::fromCFURL(cfUrl), qtUrl); + qtUrl.setUrl("www.example.com"); + QVERIFY(QUrl::fromCFURL(cfUrl) != qtUrl); + } + { + QUrl qtUrl("example.com"); + const NSURL *nsUrl = qtUrl.toNSURL(); + QCOMPARE(QUrl::fromNSURL(nsUrl), qtUrl); + qtUrl.setUrl("www.example.com"); + QVERIFY(QUrl::fromNSURL(nsUrl) != qtUrl); + } +} |