diff options
author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-06-29 14:24:39 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-07-14 13:04:53 +0000 |
commit | f091351e5d4c116ffdd16768fec60bb07efa049f (patch) | |
tree | 95d093c3f4d527e77f1181ab7b78610ebb0ce2c6 /src/quick/items/qquickitemsmodule.cpp | |
parent | cc7cf5f5705553b625c1b28b49c41587b587bb38 (diff) |
Enable building Qt Quick Sprite classes with QT_NO_OPENGL
Change-Id: Iaea1fa3bd17acee326ae8e299cb0c60d371ffb5b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick/items/qquickitemsmodule.cpp')
-rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 8ed7f2bb05..fb60331ce2 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -73,11 +73,11 @@ //#include <private/qquickpincharea_p.h> #include <QtQuick/private/qquickcanvasitem_p.h> #include <QtQuick/private/qquickcontext2d_p.h> -# include "qquickitemgrabresult.h" +#include "qquickitemgrabresult.h" +#include "qquicksprite_p.h" +#include "qquickspritesequence_p.h" +#include "qquickanimatedsprite_p.h" #ifndef QT_NO_OPENGL -# include "qquicksprite_p.h" -# include "qquickspritesequence_p.h" -# include "qquickanimatedsprite_p.h" # include "qquickopenglinfo_p.h" #endif #include "qquickgraphicsinfo_p.h" @@ -218,11 +218,11 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterUncreatableType<QQuickPaintedItem>("QtQuick", 2, 0, "PaintedItem", QQuickPaintedItem::tr("Cannot create instance of abstract class PaintedItem")); qmlRegisterType<QQuickCanvasItem>("QtQuick", 2, 0, "Canvas"); -#ifndef QT_NO_OPENGL + qmlRegisterType<QQuickSprite>("QtQuick", 2, 0, "Sprite"); qmlRegisterType<QQuickAnimatedSprite>("QtQuick", 2, 0, "AnimatedSprite"); qmlRegisterType<QQuickSpriteSequence>("QtQuick", 2, 0, "SpriteSequence"); -#endif + qmlRegisterType<QQuickParentChange>(uri, major, minor,"ParentChange"); qmlRegisterType<QQuickAnchorChanges>(uri, major, minor,"AnchorChanges"); qmlRegisterType<QQuickAnchorSet>(); |