diff options
| author | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-06-12 10:12:01 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-06-12 08:17:52 +0000 |
| commit | 55df2e54a5a770fe96cfaebf59081843edaca768 (patch) | |
| tree | 9e7a12613a1c9db32f865786ca9ba2cd0b988693 /src/corelib | |
| parent | 0ff3bbe293ca4e3741b12cbd7055b264e6b2d5b6 (diff) | |
Fix Qt-in-namespace build breakage.
Objective-C classes must be forward declared in the
global namespace.
Change-Id: Ic4818cef4b61f1578c478da9c30b77237262b283
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 4eeee0fef4..7c32c0b0a2 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -585,7 +585,9 @@ Q_DECL_CONSTEXPR inline const T &qBound(const T &min, const T &val, const T &max # define QT_OSX_DEPLOYMENT_TARGET_BELOW(osx) \ QT_MAC_DEPLOYMENT_TARGET_BELOW(osx, __IPHONE_NA) +QT_END_NAMESPACE Q_FORWARD_DECLARE_OBJC_CLASS(NSAutoreleasePool); +QT_BEGIN_NAMESPACE // Implemented in qcore_mac_objc.mm class Q_CORE_EXPORT QMacAutoReleasePool |