diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:12:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:12:25 +0200 |
| commit | 9f178cbe9ea27d247c82c7bbc396b1c3b264a06d (patch) | |
| tree | 552cc5682fef1d046e9ad9394a22620bd380ad98 /src/qml/qtqmlglobal_p.h | |
| parent | 344fbc3d2f4ccc9773e2bbe7b2969b4ac86dc9aa (diff) | |
| parent | 96f6ba5f562073f508cd8569ac354592fdd48f4a (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I3f77593ca944114534fff5df26bbb09150ee4400
Diffstat (limited to 'src/qml/qtqmlglobal_p.h')
| -rw-r--r-- | src/qml/qtqmlglobal_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h index 3314e73d19..4c0ba338d8 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 |