diff options
Diffstat (limited to 'examples/declarative/painteditem')
3 files changed, 10 insertions, 10 deletions
diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/declarative/painteditem/smile/main.cpp index 423ff295c9..1f0b3a3cb8 100644 --- a/examples/declarative/painteditem/smile/main.cpp +++ b/examples/declarative/painteditem/smile/main.cpp @@ -41,14 +41,14 @@ #include <QGuiApplication> #include <QPainter> #include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qsgview.h> -#include <QtDeclarative/qsgpainteditem.h> +#include <QtDeclarative/qquickview.h> +#include <QtDeclarative/qquickpainteditem.h> -class MyPaintItem : public QSGPaintedItem +class MyPaintItem : public QQuickPaintedItem { Q_OBJECT public: - MyPaintItem() : QSGPaintedItem() + MyPaintItem() : QQuickPaintedItem() { setAntialiasing(true); } @@ -72,8 +72,8 @@ int main(int argc, char ** argv) qmlRegisterType<MyPaintItem>("MyModule", 1, 0, "MyPaintItem"); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl::fromLocalFile("smile.qml")); view.show(); view.raise(); diff --git a/examples/declarative/painteditem/textballoons/textballoon.cpp b/examples/declarative/painteditem/textballoons/textballoon.cpp index 185cea71fb..c90118ca65 100644 --- a/examples/declarative/painteditem/textballoons/textballoon.cpp +++ b/examples/declarative/painteditem/textballoons/textballoon.cpp @@ -42,8 +42,8 @@ #include "textballoon.h" //! [0] -TextBalloon::TextBalloon(QSGItem *parent) - : QSGPaintedItem(parent) +TextBalloon::TextBalloon(QQuickItem *parent) + : QQuickPaintedItem(parent) , rightAligned(false) { } diff --git a/examples/declarative/painteditem/textballoons/textballoon.h b/examples/declarative/painteditem/textballoons/textballoon.h index 272e5f51c1..064d20bd7e 100644 --- a/examples/declarative/painteditem/textballoons/textballoon.h +++ b/examples/declarative/painteditem/textballoons/textballoon.h @@ -45,13 +45,13 @@ #include <QtDeclarative> //! [0] -class TextBalloon : public QSGPaintedItem +class TextBalloon : public QQuickPaintedItem { Q_OBJECT Q_PROPERTY(bool rightAligned READ isRightAligned WRITE setRightAligned NOTIFY rightAlignedChanged) public: - TextBalloon(QSGItem *parent = 0); + TextBalloon(QQuickItem *parent = 0); void paint(QPainter *painter); bool isRightAligned(); |