diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2017-01-12 08:26:36 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-01-30 18:56:22 +0000 |
| commit | 157a60f4879b2df53c652b259990ece26a528b60 (patch) | |
| tree | 6e09b5e2a1e9f93418165bcac2a720465d8ea072 | |
| parent | 5cb4d3951662369bb20e2890ac901070af8ce480 (diff) | |
QDistanceFieldText: export to QML
Change-Id: I538a4552435609073e846a6ec4b34f266b11446e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 8 | ||||
| -rw-r--r-- | src/quick3d/imports/render/importsrender.pro | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 2f3763c06..ffa6be945 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -67,9 +67,10 @@ #include <Qt3DExtras/qcylindergeometry.h> #include <Qt3DExtras/qtext3dgeometry.h> #include <Qt3DExtras/qtext3dmesh.h> - +#include <Qt3DExtras/qtextureatlas.h> +#include <Qt3DExtras/qdistancefieldglyphcache.h> +#include <Qt3DExtras/qdistancefieldtext.h> #include <Qt3DQuickExtras/private/quick3dlevelofdetailloader_p.h> - #include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -117,6 +118,9 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) // 3D Text qmlRegisterType<Qt3DExtras::QText3DGeometry>(uri, 2, 2, "Text3DGeometry"); qmlRegisterType<Qt3DExtras::QText3DMesh>(uri, 2, 2, "Text3DMesh"); + + qmlRegisterType<Qt3DExtras::QDistanceFieldGlyphCache>(uri, 2, 2, "DistanceFieldGlyphCache"); + qmlRegisterType<Qt3DExtras::QDistanceFieldText>(uri, 2, 2, "DistanceFieldText"); } diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro index 442068fe7..cc34ff3df 100644 --- a/src/quick3d/imports/render/importsrender.pro +++ b/src/quick3d/imports/render/importsrender.pro @@ -3,7 +3,7 @@ TARGET = quick3drenderplugin TARGETPATH = Qt3D/Render IMPORT_VERSION = 2.0 -QT += core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dquickrender-private +QT += core-private qml qml-private 3dcore 3drender 3drender-private 3dquick 3dquick-private 3dquickrender-private # Qt3D is free of Q_FOREACH - make sure it stays that way: DEFINES += QT_NO_FOREACH |