diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-23 16:23:42 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-30 20:56:46 +0200 |
| commit | 0f2079efb82bc81c8e766dbb4890cb6e5c530a38 (patch) | |
| tree | 8b998d4ff32a568969c762c944cdd409e823f3b6 /src/corelib/global/qglobal.h | |
| parent | 9ecc119276e3741b2b71f2513510f583a3f92635 (diff) | |
Extract header qdarwinhelpers.h from qglobal.h
Task-number: QTBUG-99313
Change-Id: Ia25270d381de99c5fcbb205d750e7bf86d4438dc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 65bb2b35a4..8f1cd4c684 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -63,30 +63,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOEXCEPT; #if defined(__cplusplus) -/* - Utility macros and inline functions -*/ - -#ifndef Q_FORWARD_DECLARE_OBJC_CLASS -# ifdef __OBJC__ -# define Q_FORWARD_DECLARE_OBJC_CLASS(classname) @class classname -# else -# define Q_FORWARD_DECLARE_OBJC_CLASS(classname) class classname -# endif -#endif -#ifndef Q_FORWARD_DECLARE_CF_TYPE -# define Q_FORWARD_DECLARE_CF_TYPE(type) typedef const struct __ ## type * type ## Ref -#endif -#ifndef Q_FORWARD_DECLARE_MUTABLE_CF_TYPE -# define Q_FORWARD_DECLARE_MUTABLE_CF_TYPE(type) typedef struct __ ## type * type ## Ref -#endif -#ifndef Q_FORWARD_DECLARE_CG_TYPE -#define Q_FORWARD_DECLARE_CG_TYPE(type) typedef const struct type *type ## Ref; -#endif -#ifndef Q_FORWARD_DECLARE_MUTABLE_CG_TYPE -#define Q_FORWARD_DECLARE_MUTABLE_CG_TYPE(type) typedef struct type *type ## Ref; -#endif - #ifdef Q_OS_DARWIN // Implemented in qcore_mac_objc.mm @@ -141,6 +117,7 @@ QT_END_NAMESPACE #include <QtCore/qatomic.h> #include <QtCore/qconstructormacros.h> +#include <QtCore/qdarwinhelpers.h> #include <QtCore/qenvironmentvariables.h> #include <QtCore/qexceptionhandling.h> #include <QtCore/qforeach.h> |