diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-18 13:19:46 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-08-04 12:50:12 -0700 |
| commit | c23b595769ba93e9cd7084cf9240d093bfd8a40e (patch) | |
| tree | 2e263622e085fd62560f121e2b9fe9dfae675c1e /src/corelib/global | |
| parent | a8ebadac593572601adff912ca12047c5a980371 (diff) | |
moc: move some of the helpers into a header dedicated to it
Change-Id: Id0fb9ab0089845ee8843fffd16f9d080029f2f7f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qtnamespacemacros.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/corelib/global/qtnamespacemacros.h b/src/corelib/global/qtnamespacemacros.h index e364bbd32f..056d63ee18 100644 --- a/src/corelib/global/qtnamespacemacros.h +++ b/src/corelib/global/qtnamespacemacros.h @@ -25,12 +25,6 @@ # define QT_END_NAMESPACE # define QT_BEGIN_INCLUDE_NAMESPACE # define QT_END_INCLUDE_NAMESPACE -#ifndef QT_BEGIN_MOC_NAMESPACE -# define QT_BEGIN_MOC_NAMESPACE -#endif -#ifndef QT_END_MOC_NAMESPACE -# define QT_END_MOC_NAMESPACE -#endif # define QT_FORWARD_DECLARE_CLASS(name) class name; # define QT_FORWARD_DECLARE_STRUCT(name) struct name; @@ -42,12 +36,6 @@ # define QT_END_NAMESPACE } # define QT_BEGIN_INCLUDE_NAMESPACE } # define QT_END_INCLUDE_NAMESPACE namespace QT_NAMESPACE { -#ifndef QT_BEGIN_MOC_NAMESPACE -# define QT_BEGIN_MOC_NAMESPACE QT_USE_NAMESPACE -#endif -#ifndef QT_END_MOC_NAMESPACE -# define QT_END_MOC_NAMESPACE -#endif # define QT_FORWARD_DECLARE_CLASS(name) \ QT_BEGIN_NAMESPACE class name; QT_END_NAMESPACE \ using QT_PREPEND_NAMESPACE(name); @@ -82,6 +70,14 @@ namespace QT_NAMESPACE {} #endif /* __cplusplus */ +/* ### Qt 6.9 (or later): remove *_MOC_* macros (moc does not need them since 6.5) */ +#ifndef QT_BEGIN_MOC_NAMESPACE +# define QT_BEGIN_MOC_NAMESPACE QT_USE_NAMESPACE +#endif +#ifndef QT_END_MOC_NAMESPACE +# define QT_END_MOC_NAMESPACE +#endif + /* silence syncqt warning */ QT_BEGIN_NAMESPACE QT_END_NAMESPACE |