diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-18 10:23:19 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-24 01:00:08 +0200 |
| commit | 11ee62bf76c74003a47e54987b59b8d407d1933a (patch) | |
| tree | f865fd3b7198d51095d58abd01b14f348e961958 /src/corelib/global/qglobal.h | |
| parent | 32df595275f5d50ab4458620808f80121bb9c6a0 (diff) | |
Move Q_AUTOTEST_EXPORT to qtconfigmacros.h
The include statements for qconfig*.h can now be moved there too.
Task-number: QTBUG-99313
Change-Id: I65f564fc48b9074861b0f8b50046062c2e83090c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 3815f75de5..cae86f87c3 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -22,14 +22,6 @@ #endif #include <QtCore/qtversionchecks.h> - -#ifdef QT_BOOTSTRAPPED -#include <QtCore/qconfig-bootstrapped.h> -#else -#include <QtCore/qconfig.h> -#include <QtCore/qtcore-config.h> -#endif - #include <QtCore/qtconfigmacros.h> #include <QtCore/qtcoreexports.h> @@ -56,19 +48,6 @@ inline void qt_noop(void) {} #ifndef __ASSEMBLER__ QT_BEGIN_NAMESPACE -/* - No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols - for Qt's internal unit tests. If you want slower loading times and more - symbols that can vanish from version to version, feel free to define QT_BUILD_INTERNAL. -*/ -#if defined(QT_BUILD_INTERNAL) && defined(QT_BUILDING_QT) && defined(QT_SHARED) -# define Q_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(QT_BUILD_INTERNAL) && defined(QT_SHARED) -# define Q_AUTOTEST_EXPORT Q_DECL_IMPORT -#else -# define Q_AUTOTEST_EXPORT -#endif - #define Q_INIT_RESOURCE(name) \ do { extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); \ QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); } while (false) |