From 375c5a0076045f68ddbfd8e3503cbd6d428f9486 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 31 May 2016 18:42:00 +0200 Subject: Properly forward-declare the Apple types with Q_QDOC They are needed for the header to be parsed properly with clang based qdoc. While we are at it, change the condition from Q_OS_MAC to Q_OS_DARWIN Change-Id: I2a2f9c1159f47795d9811023d67c86fec1866846 Reviewed-by: Jake Petroules --- src/corelib/io/qurl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/io/qurl.h') diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index c565ac408e..bce271fcb1 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -48,7 +48,7 @@ #include #include -#if defined(Q_OS_MAC) +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) Q_FORWARD_DECLARE_CF_TYPE(CFURL); Q_FORWARD_DECLARE_OBJC_CLASS(NSURL); #endif @@ -275,7 +275,7 @@ public: static QByteArray toPercentEncoding(const QString &, const QByteArray &exclude = QByteArray(), const QByteArray &include = QByteArray()); -#if defined(Q_OS_MAC) || defined(Q_QDOC) +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) static QUrl fromCFURL(CFURLRef url); CFURLRef toCFURL() const Q_DECL_CF_RETURNS_RETAINED; static QUrl fromNSURL(const NSURL *url); -- cgit v1.2.3