QQuickCanvas renames

[profile/ivi/qtdeclarative.git] / src / quick / items / qquickview_p.h

diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index 9b0e26e..0442f78 100644 (file)
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -48,8 +48,10 @@
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qtimer.h>
 #include <QtCore/qpointer.h>
+#include <QtCore/QWeakPointer>
+
 #include <QtQml/qqmlengine.h>
-#include "qquickcanvas_p.h"
+#include "qquickwindow_p.h"
 
 #include "qquickitemchangelistener_p.h"
 
@@ -62,7 +64,7 @@ class QQmlError;
 class QQuickItem;
 class QQmlComponent;
 
-class QQuickViewPrivate : public QQuickCanvasPrivate,
+class QQuickViewPrivate : public QQuickWindowPrivate,
                        public QQuickItemChangeListener
 {
     Q_DECLARE_PUBLIC(QQuickView)
@@ -79,7 +81,7 @@ public:
     void updateSize();
     void setRootObject(QObject *);
 
-    void init();
+    void init(QQmlEngine* e = 0);
 
     QSize rootObjectSize() const;
 
@@ -87,7 +89,7 @@ public:
 
     QUrl source;
 
-    QQmlEngine engine;
+    QPointer<QQmlEngine> engine;
     QQmlComponent *component;
     QBasicTimer resizetimer;