Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	src/qml/debugger/qv4debugservice.cpp
	src/qml/jsruntime/qv4value_inl_p.h
	src/qml/jsruntime/qv4value_p.h
	src/qml/memory/qv4mm.cpp
	src/qml/memory/qv4mm_p.h
	src/qml/qml/qqmlnotifier_p.h
	src/qml/qml/qqmlproperty.cpp
	src/quick/items/qquickflickable.cpp
	src/quick/items/qquicktextedit.cpp
	tests/auto/quick/qquickwindow/BLACKLIST

The extra changes in qqmlbinding.cpp are ported from changes to
qqmlproperty.cpp that occurred in parallel with writeBinding() being
moved to qqmlbinding.cpp.

Change-Id: I16d1920abf448c29a01822256f52153651a56356

2 files changed, 9 insertions, 5 deletions

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 8fa290b953..9932747dd3 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -57,7 +57,11 @@ class QQuickCanvasNode : public QSGSimpleTextureNode
 public:
     QQuickCanvasNode() {
         qsgnode_set_description(this, QStringLiteral("canvasnode"));
-        setOwnsTexture(true);
+        setOwnsTexture(false);
+    }
+
+    ~QQuickCanvasNode() {
+        delete texture();
     }
 };
 
diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
index 782d03f9f9..4a2c137aa1 100644
--- a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
+++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
@@ -92,7 +92,7 @@ namespace {
         {
         }
 
-        void paint(QPainter *p) const { p->fillRect(m_rect, m_brush); }
+        void paint(QPainter *p) const Q_DECL_OVERRIDE { p->fillRect(m_rect, m_brush); }
         QRectF boundingRect() const Q_DECL_OVERRIDE { return m_rect; }
 
     private:
@@ -109,7 +109,7 @@ namespace {
         {
         }
 
-        void paint(QPainter *p) const { p->fillPath(m_path, m_brush); }
+        void paint(QPainter *p) const Q_DECL_OVERRIDE { p->fillPath(m_path, m_brush); }
         QRectF boundingRect() const Q_DECL_OVERRIDE { return m_path.boundingRect(); }
 
     private:
@@ -126,7 +126,7 @@ namespace {
         {
         }
 
-        void paint(QPainter *p) const { p->strokePath(m_path, m_pen); }
+        void paint(QPainter *p) const Q_DECL_OVERRIDE { p->strokePath(m_path, m_pen); }
 
         QRectF boundingRect() const Q_DECL_OVERRIDE
         {
@@ -148,7 +148,7 @@ namespace {
         {
         }
 
-        void paint(QPainter *p) const { p->drawImage(m_offset, m_image); }
+        void paint(QPainter *p) const Q_DECL_OVERRIDE { p->drawImage(m_offset, m_image); }
 
         QRectF boundingRect() const Q_DECL_OVERRIDE { return QRectF(m_image.rect()).translated(m_offset); }