diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-18 16:59:02 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-19 04:17:42 +0000 |
| commit | 1e8f85dbc90da6b49fa7018ccbc35db68281d395 (patch) | |
| tree | 900bdc0143684427ff3b98b54a91dbb43a4e5ded | |
| parent | ee6b07b3ce8ba80632868181d45d96253acb1064 (diff) | |
don't try to pull in the regular config headers when bootstrapping
Task-number: QTBUG-60675
Change-Id: I7ae9ab4f442d34f6eaa770652029b5dfccef346a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qml/qtqmlglobal.h | 16 | ||||
| -rw-r--r-- | src/qml/qtqmlglobal_p.h | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/qml/qtqmlglobal.h b/src/qml/qtqmlglobal.h index 6704e55b52..387c28a945 100644 --- a/src/qml/qtqmlglobal.h +++ b/src/qml/qtqmlglobal.h @@ -40,18 +40,20 @@ #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> -#include <QtQml/qtqml-config.h> -#if QT_CONFIG(qml_network) -#include <QtNetwork/qtnetworkglobal.h> +#ifndef QT_QML_BOOTSTRAPPED +# include <QtQml/qtqml-config.h> +# if QT_CONFIG(qml_network) +# include <QtNetwork/qtnetworkglobal.h> +# endif #endif QT_BEGIN_NAMESPACE -#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) -# define QT_QML_BOOTSTRAPPED -#endif - #if !defined(QT_QML_BOOTSTRAPPED) && !defined(QT_STATIC) # if defined(QT_BUILD_QML_LIB) # define Q_QML_EXPORT Q_DECL_EXPORT diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h index e9834ffc4c..0313d8e33b 100644 --- a/src/qml/qtqmlglobal_p.h +++ b/src/qml/qtqmlglobal_p.h @@ -52,8 +52,10 @@ // #include <QtCore/private/qglobal_p.h> -#include <QtQml/private/qtqml-config_p.h> #include <QtQml/qtqmlglobal.h> +#ifndef QT_QML_BOOTSTRAPPED +# include <QtQml/private/qtqml-config_p.h> +#endif #define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT |