Convert qtdeclarative over to use the new configure system
Change-Id: I105d46e1a4e666f11c07ad63aa24a7c388da1be6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
parent
a6be2d77aa
commit
e48c4134af
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"subconfigs": [
|
||||
"src/qml",
|
||||
"src/quick"
|
||||
]
|
||||
}
|
|
@ -1,6 +1,3 @@
|
|||
load(configure)
|
||||
qtCompileTest(d3d12)
|
||||
|
||||
CONFIG += tests_need_tools examples_need_tools
|
||||
load(qt_parts)
|
||||
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"module": "qml",
|
||||
"depends": [
|
||||
"core-private",
|
||||
"network-private"
|
||||
]
|
||||
}
|
|
@ -41,6 +41,8 @@
|
|||
#define QTQMLGLOBAL_H
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
#include <QtQml/qtqml-config.h>
|
||||
#include <QtNetwork/qtnetworkglobal.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
//
|
||||
|
|
Loading…
Reference in New Issue