aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-08-11 15:46:45 +0200
committerLars Knoll <lars.knoll@qt.io>2016-10-10 14:11:39 +0000
commite48c4134afcb8d4b33c3e965ce5d94e629982d2e (patch)
treef69c74c2c9355c969764c6c72e9282f6ff631aef
parenta6be2d77aa6dc9f834b971eaff749a02cf982525 (diff)
Convert qtdeclarative over to use the new configure system
Change-Id: I105d46e1a4e666f11c07ad63aa24a7c388da1be6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--configure.json6
-rw-r--r--qtdeclarative.pro3
-rw-r--r--src/qml/configure.json7
-rw-r--r--src/qml/qtqmlglobal.h2
-rw-r--r--src/qml/qtqmlglobal_p.h4
-rw-r--r--src/quick/configure.json41
-rw-r--r--src/quick/qtquickglobal.h4
-rw-r--r--src/quick/qtquickglobal_p.h4
8 files changed, 66 insertions, 5 deletions
diff --git a/configure.json b/configure.json
new file mode 100644
index 0000000000..fd1f58863c
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,6 @@
+{
+ "subconfigs": [
+ "src/qml",
+ "src/quick"
+ ]
+}
diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index c9df6e053b..5b94da9b69 100644
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -1,6 +1,3 @@
-load(configure)
-qtCompileTest(d3d12)
-
CONFIG += tests_need_tools examples_need_tools
load(qt_parts)
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
diff --git a/src/quick/configure.json b/src/quick/configure.json
new file mode 100644
index 0000000000..de75873972
--- /dev/null
+++ b/src/quick/configure.json
@@ -0,0 +1,41 @@
+{
+ "module": "quick",
+ "depends": [
+ "qml-private",
+ "gui-private"
+ ],
+
+ "commandline": {
+ "options": {
+ "d3d12": "boolean"
+ }
+ },
+
+ "tests": {
+ "d3d12": {
+ "label": "Direct3D 12",
+ "type": "compile",
+ "test": "d3d12"
+ }
+ },
+
+ "features": {
+ "d3d12": {
+ "label": "Direct3D 12",
+ "purpose": "Provides a Direct3D 12 backend for the Qt Quick Scenegraph",
+ "condition": "tests.d3d12",
+ "output": [
+ "privateFeature"
+ ]
+ }
+ },
+
+ "summary": [
+ {
+ "section": "Qt Quick",
+ "entries": [
+ "d3d12"
+ ]
+ }
+ ]
+}
diff --git a/src/quick/qtquickglobal.h b/src/quick/qtquickglobal.h
index f6f8f42e7f..5e83c1db84 100644
--- a/src/quick/qtquickglobal.h
+++ b/src/quick/qtquickglobal.h
@@ -40,7 +40,9 @@
#ifndef QTQUICKGLOBAL_H
#define QTQUICKGLOBAL_H
-#include <QtCore/qglobal.h>
+#include <QtQml/qtqmlglobal.h>
+#include <QtGui/qtguiglobal.h>
+#include <QtQuick/qtquick-config.h>
QT_BEGIN_NAMESPACE
diff --git a/src/quick/qtquickglobal_p.h b/src/quick/qtquickglobal_p.h
index 3c313de0a1..f6376a6d17 100644
--- a/src/quick/qtquickglobal_p.h
+++ b/src/quick/qtquickglobal_p.h
@@ -40,6 +40,10 @@
#ifndef QTQUICKGLOBAL_P_H
#define QTQUICKGLOBAL_P_H
+#include <QtQml/private/qtqmlglobal_p.h>
+#include <QtGui/private/qtguiglobal_p.h>
+#include <QtQuick/private/qtquick-config_p.h>
+
#include <QtCore/qloggingcategory.h>
//