diff options
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 46 |
1 files changed, 2 insertions, 44 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 147933066f..77eb691dad 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -33,46 +33,10 @@ #include <QtCore/qtcore-config.h> #endif -/* - The Qt modules' export macros. - The options are: - - defined(QT_STATIC): Qt was built or is being built in static mode - - defined(QT_SHARED): Qt was built or is being built in shared/dynamic mode - If neither was defined, then QT_SHARED is implied. If Qt was compiled in static - mode, QT_STATIC is defined in qconfig.h. In shared mode, QT_STATIC is implied - for the bootstrapped tools. -*/ - -#ifdef QT_BOOTSTRAPPED -# ifdef QT_SHARED -# error "QT_SHARED and QT_BOOTSTRAPPED together don't make sense. Please fix the build" -# elif !defined(QT_STATIC) -# define QT_STATIC -# endif -#endif - -#if defined(QT_SHARED) || !defined(QT_STATIC) -# ifdef QT_STATIC -# error "Both QT_SHARED and QT_STATIC defined, please make up your mind" -# endif -# ifndef QT_SHARED -# define QT_SHARED -# endif -#endif - +#include <QtCore/qtconfigmacros.h> #include <QtCore/qtcoreexports.h> /* - The QT_CONFIG macro implements a safe compile time check for features of Qt. - Features can be in three states: - 0 or undefined: This will lead to a compile error when testing for it - -1: The feature is not available - 1: The feature is available -*/ -#define QT_CONFIG(feature) (1/QT_FEATURE_##feature == 1) -#define QT_REQUIRE_CONFIG(feature) Q_STATIC_ASSERT_X(QT_FEATURE_##feature == 1, "Required feature " #feature " for file " __FILE__ " not available.") - -/* helper macros to make some simple code work active in Qt 6 or Qt 7 only, like: struct QT6_ONLY(Q_CORE_EXPORT) QTrivialClass @@ -121,7 +85,7 @@ # define QT6_IMPL_NEW_OVERLOAD QT6_ONLY(Qt::Disambiguated_t) # define QT6_IMPL_NEW_OVERLOAD_TAIL QT6_ONLY(, QT6_IMPL_NEW_OVERLOAD) # define QT6_CALL_NEW_OVERLOAD QT6_ONLY(Qt::Disambiguated) -# define QT6_CALL_NEW_OVERLOAD_TAIL QT6_ONLY(, QT_CALL_NEW_OVERLOAD) +# define QT6_CALL_NEW_OVERLOAD_TAIL QT6_ONLY(, QT6_CALL_NEW_OVERLOAD) #endif /* These two macros makes it possible to turn the builtin line expander into a @@ -192,12 +156,6 @@ static_assert(!std::is_convertible_v<std::nullptr_t, bool>, # define Q_STATIC_ASSERT_X(Condition, Message) Q_STATIC_ASSERT(Condition) #endif -# include <QtCore/qtnamespacemacros.h> - -#if defined(Q_OS_DARWIN) && !defined(QT_LARGEFILE_SUPPORT) -# define QT_LARGEFILE_SUPPORT 64 -#endif - #ifndef __ASSEMBLER__ QT_BEGIN_NAMESPACE |