diff options
Diffstat (limited to 'src/declarative/items/qsgimage_p.h')
| -rw-r--r-- | src/declarative/items/qsgimage_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/items/qsgimage_p.h b/src/declarative/items/qsgimage_p.h index 8737609521..aad63d42c0 100644 --- a/src/declarative/items/qsgimage_p.h +++ b/src/declarative/items/qsgimage_p.h @@ -44,7 +44,7 @@ #define QSGIMAGE_P_H #include "qsgimagebase_p.h" -#include "qsgtextureprovider.h" +#include <private/qsgtextureprovider_p.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QSGImagePrivate; -class Q_AUTOTEST_EXPORT QSGImage : public QSGImageBase, public QSGTextureProviderInterface +class Q_AUTOTEST_EXPORT QSGImage : public QSGImageBase, public QSGTextureProvider { Q_OBJECT Q_ENUMS(FillMode) @@ -61,9 +61,9 @@ class Q_AUTOTEST_EXPORT QSGImage : public QSGImageBase, public QSGTextureProvide Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged) Q_PROPERTY(qreal paintedWidth READ paintedWidth NOTIFY paintedGeometryChanged) Q_PROPERTY(qreal paintedHeight READ paintedHeight NOTIFY paintedGeometryChanged) - Q_PROPERTY(QSGTextureProvider *texture READ textureProvider) + Q_PROPERTY(QSGTexture *texture READ texture) - Q_INTERFACES(QSGTextureProviderInterface) + Q_INTERFACES(QSGTextureProvider) public: QSGImage(QSGItem *parent=0); @@ -78,7 +78,7 @@ public: QRectF boundingRect() const; - virtual QSGTextureProvider *textureProvider() const; + virtual QSGTexture *texture() const; Q_SIGNALS: void fillModeChanged(); @@ -90,7 +90,7 @@ protected: void updatePaintedGeometry(); virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - virtual Node *updatePaintNode(Node *, UpdatePaintNodeData *); + virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); private: Q_DISABLE_COPY(QSGImage) |