Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: I7e43a0a47d49de38617f6afc7548f9a9e212a851

2 files changed, 14 insertions, 14 deletions

diff --git a/examples/quick/canvas/smile/smile.qml b/examples/quick/canvas/smile/smile.qml
index eebfee2d77..25e9d031de 100644
--- a/examples/quick/canvas/smile/smile.qml
+++ b/examples/quick/canvas/smile/smile.qml
@@ -101,14 +101,14 @@ Item {
                 ctx.moveTo(75 + 50  * Math.cos(0),
                            75 - 50  * Math.sin(Math.PI*2));
                 ctx.arc(75,75,50,0,Math.PI*2,true); // Outer circle
-                ctx.moveTo(75,70);
-                ctx.arc(75,70,35,0,Math.PI,false);   // Mouth (clockwise)
-                ctx.moveTo(60,65);
-                ctx.arc(60,65,5,0,Math.PI*2,true);  // Left eye
+                ctx.moveTo(60,60);
+                ctx.arc(60,60,5,0,Math.PI*2,true);  // Left eye
                 ctx.moveTo(90 + 5  * Math.cos(0),
                            65 - 5  * Math.sin(Math.PI*2));
-                ctx.moveTo(90,65);
-                ctx.arc(90,65,5,0,Math.PI*2,true);  // Right eye
+                ctx.moveTo(90,60);
+                ctx.arc(90,60,5,-Math.PI,Math.PI*3,false);  // Right eye
+                ctx.moveTo(75,70);
+                ctx.arc(75,70,35,0,Math.PI,false);   // Mouth (clockwise)
                 ctx.closePath();
                 if (canvas.fill)
                     ctx.fill();
diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.cpp b/examples/quick/imageresponseprovider/imageresponseprovider.cpp
index a888c823a6..d4633b779a 100644
--- a/examples/quick/imageresponseprovider/imageresponseprovider.cpp
+++ b/examples/quick/imageresponseprovider/imageresponseprovider.cpp
@@ -51,37 +51,37 @@ class AsyncImageResponse : public QQuickImageResponse, public QRunnable
 {
     public:
         AsyncImageResponse(const QString &id, const QSize &requestedSize)
-         : m_id(id), m_requestedSize(requestedSize), m_texture(0)
+         : m_id(id), m_requestedSize(requestedSize)
         {
             setAutoDelete(false);
         }
 
         QQuickTextureFactory *textureFactory() const
         {
-            return m_texture;
+            return QQuickTextureFactory::textureFactoryForImage(m_image);
         }
 
         void run()
         {
-            QImage image(50, 50, QImage::Format_RGB32);
+            m_image = QImage(50, 50, QImage::Format_RGB32);
             if (m_id == "slow") {
                 qDebug() << "Slow, red, sleeping for 5 seconds";
                 QThread::sleep(5);
-                image.fill(Qt::red);
+                m_image.fill(Qt::red);
             } else {
                 qDebug() << "Fast, blue, sleeping for 1 second";
                 QThread::sleep(1);
-                image.fill(Qt::blue);
+                m_image.fill(Qt::blue);
             }
             if (m_requestedSize.isValid())
-                image = image.scaled(m_requestedSize);
-            m_texture = QQuickTextureFactory::textureFactoryForImage(image);
+                m_image = m_image.scaled(m_requestedSize);
+
             emit finished();
         }
 
         QString m_id;
         QSize m_requestedSize;
-        QQuickTextureFactory *m_texture;
+        QImage m_image;
 };
 
 class AsyncImageProvider : public QQuickAsyncImageProvider