Introduce a new constructor to QQuickView

Make it possible let QQuickView use an existing qml engine
and multiple QQuickView objects can share one QQmlEngine instance.

Change-Id: I035d1c15155be22f1131b504c40cf4ffb5da0f45
Reviewed-by: Glenn Watson <[email protected]>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index 9b0e26e30d..00f7640c10 100644
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -48,6 +48,8 @@
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qtimer.h>
 #include <QtCore/qpointer.h>
+#include <QtCore/QWeakPointer>
+
 #include <QtQml/qqmlengine.h>
 #include "qquickcanvas_p.h"
 
@@ -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;
+    QWeakPointer<QQmlEngine> engine;
     QQmlComponent *component;
     QBasicTimer resizetimer;