diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-11 15:46:45 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-10 14:11:39 +0000 |
| commit | e48c4134afcb8d4b33c3e965ce5d94e629982d2e (patch) | |
| tree | f69c74c2c9355c969764c6c72e9282f6ff631aef /src/qml | |
| parent | a6be2d77aa6dc9f834b971eaff749a02cf982525 (diff) | |
Convert qtdeclarative over to use the new configure system
Change-Id: I105d46e1a4e666f11c07ad63aa24a7c388da1be6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/configure.json | 7 | ||||
| -rw-r--r-- | src/qml/qtqmlglobal.h | 2 | ||||
| -rw-r--r-- | src/qml/qtqmlglobal_p.h | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/qml/configure.json b/src/qml/configure.json new file mode 100644 index 0000000000..34b83ba9ff --- /dev/null +++ b/src/qml/configure.json @@ -0,0 +1,7 @@ +{ + "module": "qml", + "depends": [ + "core-private", + "network-private" + ] +} diff --git a/src/qml/qtqmlglobal.h b/src/qml/qtqmlglobal.h index 34191d06b2..8529e1f980 100644 --- a/src/qml/qtqmlglobal.h +++ b/src/qml/qtqmlglobal.h @@ -41,6 +41,8 @@ #define QTQMLGLOBAL_H #include <QtCore/qglobal.h> +#include <QtQml/qtqml-config.h> +#include <QtNetwork/qtnetworkglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h index 1b0872298d..63585fd62e 100644 --- a/src/qml/qtqmlglobal_p.h +++ b/src/qml/qtqmlglobal_p.h @@ -51,7 +51,9 @@ // We mean it. // -#include "qtqmlglobal.h" +#include <QtCore/private/qglobal_p.h> +#include <QtQml/private/qtqml-config_p.h> +#include <QtQml/qtqmlglobal.h> #if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) # define Q_QML_PRIVATE_EXPORT |