diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-09-30 08:45:10 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-09-30 12:48:57 +0200 |
| commit | 4deb42b5985cd50d7c2c8983ba0dbf21a45f9c7c (patch) | |
| tree | 94392c9e4d2a3d18c139a3cadfacb9456468e1c3 | |
| parent | 466edbf12c7c573fec7326ff4897ef44bda146a3 (diff) | |
Remove obsolete devtools lib ifdefery
Change-Id: Ifc5fc430046eb0d72434a701812fd27b200f992b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/qml/parser/qqmljsglobal_p.h | 5 | ||||
| -rw-r--r-- | src/qml/qtqmlcompilerglobal.h | 2 | ||||
| -rw-r--r-- | src/qml/qtqmlglobal.h | 19 | ||||
| -rw-r--r-- | src/qml/qtqmlglobal_p.h | 11 |
4 files changed, 8 insertions, 29 deletions
diff --git a/src/qml/parser/qqmljsglobal_p.h b/src/qml/parser/qqmljsglobal_p.h index e7937ebc3b..9eceb7a6ca 100644 --- a/src/qml/parser/qqmljsglobal_p.h +++ b/src/qml/parser/qqmljsglobal_p.h @@ -53,10 +53,7 @@ #include <QtCore/qglobal.h> #ifndef QT_STATIC -# if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) - // QmlDevTools is a static library -# define QML_PARSER_EXPORT -# elif defined(QT_BUILD_QML_LIB) +# if defined(QT_BUILD_QML_LIB) # define QML_PARSER_EXPORT Q_DECL_EXPORT # else # define QML_PARSER_EXPORT Q_DECL_IMPORT diff --git a/src/qml/qtqmlcompilerglobal.h b/src/qml/qtqmlcompilerglobal.h index 850d413372..81bd63eb95 100644 --- a/src/qml/qtqmlcompilerglobal.h +++ b/src/qml/qtqmlcompilerglobal.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) || defined(QT_STATIC) +#if defined(QT_STATIC) # define Q_QMLCOMPILER_EXPORT #else # if defined(QT_BUILD_QML_LIB) diff --git a/src/qml/qtqmlglobal.h b/src/qml/qtqmlglobal.h index 3e275c6359..387eba6231 100644 --- a/src/qml/qtqmlglobal.h +++ b/src/qml/qtqmlglobal.h @@ -40,27 +40,16 @@ #ifndef QTQMLGLOBAL_H #define QTQMLGLOBAL_H -#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) -# define QT_QML_BOOTSTRAPPED -#endif #include <QtCore/qglobal.h> -#ifndef QT_QML_BOOTSTRAPPED -# include <QtQml/qtqml-config.h> -# if QT_CONFIG(qml_network) -# include <QtNetwork/qtnetworkglobal.h> -# endif -#else -# define QT_FEATURE_qml_debug -1 -# define QT_FEATURE_qml_sequence_object 1 -# define QT_FEATURE_qml_jit -1 -# define QT_FEATURE_qml_worker_script -1 -# define QT_FEATURE_qml_xml_http_request -1 +#include <QtQml/qtqml-config.h> +#if QT_CONFIG(qml_network) +# include <QtNetwork/qtnetworkglobal.h> #endif QT_BEGIN_NAMESPACE -#if !defined(QT_QML_BOOTSTRAPPED) && !defined(QT_STATIC) +#if !defined(QT_STATIC) # if defined(QT_BUILD_QML_LIB) # define Q_QML_EXPORT Q_DECL_EXPORT # else diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h index 4c0ba338d8..02f4f54119 100644 --- a/src/qml/qtqmlglobal_p.h +++ b/src/qml/qtqmlglobal_p.h @@ -53,16 +53,9 @@ #include <QtCore/private/qglobal_p.h> #include <QtQml/qtqmlglobal.h> -#ifndef QT_QML_BOOTSTRAPPED -# include <QtQml/private/qtqml-config_p.h> -#endif +#include <QtQml/private/qtqml-config_p.h> #define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT - -#if !defined(QT_QMLDEVTOOLS_LIB) && !defined(QT_BUILD_QMLDEVTOOLS_LIB) -# define Q_QML_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT -#else -# define Q_QML_AUTOTEST_EXPORT -#endif +#define Q_QML_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT #endif // QTQMLGLOBAL_P_H |