diff options
Diffstat (limited to 'src/declarative/items/qsgitemsmodule.cpp')
| -rw-r--r-- | src/declarative/items/qsgitemsmodule.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp index f2b14d336b..aa74ff6bc5 100644 --- a/src/declarative/items/qsgitemsmodule.cpp +++ b/src/declarative/items/qsgitemsmodule.cpp @@ -70,8 +70,8 @@ #include "qsgtranslate_p.h" #include "qsgstateoperations_p.h" #include "qsganimation_p.h" -#include "shadereffectitem.h" -#include "shadereffectsource.h" +#include <private/qsgshadereffectitem_p.h> +#include <private/qsgshadereffectsource_p.h> //#include "private/qsgpincharea_p.h" static QDeclarativePrivate::AutoParentResult qsgitem_autoParent(QObject *obj, QObject *parent) @@ -166,8 +166,12 @@ static void qt_sgitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QSGPinch>(uri,major,minor,"Pinch"); qmlRegisterType<QSGPinchEvent>(); - qmlRegisterType<ShaderEffectItem>("QtQuick", 2, 0, "ShaderEffectItem"); - qmlRegisterType<ShaderEffectSource>("QtQuick", 2, 0, "ShaderEffectSource"); + qmlRegisterType<QSGShaderEffectItem>("QtQuick", 2, 0, "ShaderEffectItem"); + qmlRegisterType<QSGShaderEffectSource>("QtQuick", 2, 0, "ShaderEffectSource"); + qmlRegisterUncreatableType<QSGShaderEffectMesh>("QtQuick", 2, 0, "ShaderEffectMesh", QSGShaderEffectMesh::tr("Cannot create instance of abstract class ShaderEffectMesh.")); + qmlRegisterType<QSGGridMesh>("QtQuick", 2, 0, "GridMesh"); + + qmlRegisterUncreatableType<QSGPaintedItem>("QtQuick", 2, 0, "PaintedItem", QSGPaintedItem::tr("Cannot create instance of abstract class PaintedItem")); qmlRegisterType<QSGParentChange>(uri, major, minor,"ParentChange"); qmlRegisterType<QSGAnchorChanges>(uri, major, minor,"AnchorChanges"); |