Initial window implementation

Includes adding a color property on QQuickCanvas. Note that most Window
related properties come from the QWindow inheritance.

Task-number: QTBUG-19799
Change-Id: I00f6c90a1e2a5c85d787793d6edac2cd7d5309ab
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/declarative/items/qquickcanvas_p.h b/src/declarative/items/qquickcanvas_p.h
index fdfe0911f5..13ca288cb1 100644
--- a/src/declarative/items/qquickcanvas_p.h
+++ b/src/declarative/items/qquickcanvas_p.h
@@ -73,13 +73,18 @@
 QT_BEGIN_NAMESPACE
 
 //Make it easy to identify and customize the root item if needed
+
 class QQuickRootItem : public QQuickItem
 {
     Q_OBJECT
 public:
     QQuickRootItem();
+public Q_SLOTS:
+    void setWidth(int w) {QQuickItem::setWidth(qreal(w));}
+    void setHeight(int h) {QQuickItem::setHeight(qreal(h));}
 };
 
+class QQuickItemPrivate;
 class QQuickCanvasPrivate;
 
 class QTouchEvent;
@@ -97,8 +102,10 @@ public:
     virtual ~QQuickCanvasPrivate();
 
     void init(QQuickCanvas *);
+    void initRootItem();//Currently only used if items added in QML
 
     QQuickRootItem *rootItem;
+    QDeclarativeListProperty<QObject> data();
 
     QQuickItem *activeFocusItem;
     QQuickItem *mouseGrabberItem;
@@ -175,6 +182,7 @@ public:
     QHash<int, QQuickItem *> itemForTouchPointId;
 
     mutable QQuickCanvasIncubationController *incubationController;
+
 private:
     static void cleanupNodesOnShutdown(QQuickItem *);
 };