diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 18:46:38 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:02:37 +0200 |
commit | c2f8b9535d34da6948ccf45b7d5fd90de2f1bc9e (patch) | |
tree | c6f7e058a985d7c18b51cadc76283caf555071c9 /examples/quick/scenegraph/d3d11underqml | |
parent | 9e633bbda7608ac0231809e2a6a97ae8f2d849d6 (diff) | |
parent | 803f18f02e5609a1ca00a5b78ea6d3613d44e1a0 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.
Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922
Diffstat (limited to 'examples/quick/scenegraph/d3d11underqml')
4 files changed, 7 insertions, 4 deletions
diff --git a/examples/quick/scenegraph/d3d11underqml/d3d11squircle.h b/examples/quick/scenegraph/d3d11underqml/d3d11squircle.h index be9aadc43b..4be3671d1c 100644 --- a/examples/quick/scenegraph/d3d11underqml/d3d11squircle.h +++ b/examples/quick/scenegraph/d3d11underqml/d3d11squircle.h @@ -59,6 +59,7 @@ class D3D11Squircle : public QQuickItem { Q_OBJECT Q_PROPERTY(qreal t READ t WRITE setT NOTIFY tChanged) + QML_ELEMENT public: D3D11Squircle(); diff --git a/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro b/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro index 3c94d48ac4..7658a9a813 100644 --- a/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro +++ b/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro @@ -1,3 +1,5 @@ +!win32: error("This example requires Windows") + QT += qml quick HEADERS += d3d11squircle.h diff --git a/examples/quick/scenegraph/d3d11underqml/doc/src/d3d11underqml.qdoc b/examples/quick/scenegraph/d3d11underqml/doc/src/d3d11underqml.qdoc index d7b60d3b81..1f0c15e1c6 100644 --- a/examples/quick/scenegraph/d3d11underqml/doc/src/d3d11underqml.qdoc +++ b/examples/quick/scenegraph/d3d11underqml/doc/src/d3d11underqml.qdoc @@ -51,8 +51,8 @@ program that draws the squircles. The example is equivalent in most ways to the \l{Scene Graph - OpenGL Under - QML}{OpenGL Under QML} and \l{Scene Graph - Metal Under QML}{Metal Under - QML} examples, they all render the same custom content, just via different - native APIs. + QML}{OpenGL Under QML}, \l{Scene Graph - Metal Under QML}{Metal Under QML}, + and \l{Scene Graph - Vulkan Under QML}{Vulkan Under QML} examples, they all + render the same custom content, just via different native APIs. */ diff --git a/examples/quick/scenegraph/d3d11underqml/main.cpp b/examples/quick/scenegraph/d3d11underqml/main.cpp index d26de1144a..dcab8c879c 100644 --- a/examples/quick/scenegraph/d3d11underqml/main.cpp +++ b/examples/quick/scenegraph/d3d11underqml/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - qmlRegisterType<D3D11Squircle>("D3D11UnderQML", 1, 0, "D3D11Squircle"); + qmlRegisterTypesAndRevisions<D3D11Squircle>("D3D11UnderQML", 1); QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Direct3D11Rhi); |