diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2016-05-31 18:42:00 +0200 |
|---|---|---|
| committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2016-05-31 17:20:56 +0000 |
| commit | 375c5a0076045f68ddbfd8e3503cbd6d428f9486 (patch) | |
| tree | 2cd32822b1e6aa339d38baf95b15ad075f64ad07 /src/corelib/tools/qstring.h | |
| parent | e70324f8dd1f191556599cf60100dd0ad0b16708 (diff) | |
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 <jake.petroules@qt.io>
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 6599a5b18c..06287c056d 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -68,7 +68,7 @@ namespace std #error qstring.h must be included before any header file that defines truncate #endif -#if defined(Q_OS_MAC) +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) Q_FORWARD_DECLARE_CF_TYPE(CFString); Q_FORWARD_DECLARE_OBJC_CLASS(NSString); #endif @@ -778,7 +778,7 @@ public: inline std::u32string toStdU32String() const; #endif -#if defined(Q_OS_MAC) || defined(Q_QDOC) +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) static QString fromCFString(CFStringRef string); CFStringRef toCFString() const Q_DECL_CF_RETURNS_RETAINED; static QString fromNSString(const NSString *string); |