diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2018-02-02 11:44:22 +0000 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2018-02-05 15:54:34 +0000 |
| commit | cf1b732e21b8768c0e423f900a3f11f923863edd (patch) | |
| tree | 0e875743d56b140c75cc4b30654c7cc8213b4471 /src/corelib/global/qglobal.h | |
| parent | 2e0849e79c851318da0f148dd4002b02cea66dbe (diff) | |
Introduce QT6_VIRTUAL and QT6_NOT_VIRTUAL macros
To avoid QT_VERSION_CHECK ifdefs
Change-Id: I364903964c72f4df19b8b7c10c19b82d24f63600
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7764707de0..aa9446221b 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -88,6 +88,11 @@ #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) # define QT_NO_UNSHARABLE_CONTAINERS +# define QT6_VIRTUAL virtual +# define QT6_NOT_VIRTUAL +#else +# define QT6_VIRTUAL +# define QT6_NOT_VIRTUAL virtual #endif /* These two macros makes it possible to turn the builtin line expander into a |