diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-09 18:28:40 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-11 09:42:03 +0200 |
| commit | 43b59a842a86140fa5f5da2f0d66d0d916883c8f (patch) | |
| tree | c98cc1f537189d9a95e789ab1d295f5b9ba322f2 /src/corelib/global/qglobal.h | |
| parent | 22b16a1db143ff6764a55d3b58bd26b1f3c95a8a (diff) | |
Move QT_SHARED, QT_STATIC and QT_CONFIG macos to qtconfigmacros.h
Change-Id: Icf4621fa22f41355f98ed38b47560706258b41b7
Pick-to: 6.4
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 1151a1b6a9..83f9e1fc0d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -31,46 +31,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 @@ -166,8 +130,6 @@ # define Q_STATIC_ASSERT_X(Condition, Message) Q_STATIC_ASSERT(Condition) #endif -# include <QtCore/qtconfigmacros.h> - #ifndef __ASSEMBLER__ QT_BEGIN_NAMESPACE |