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

Change-Id: I0cbb2ba4a00580e6a74a4e4085fc4eb06d0fadae

4 files changed, 65 insertions, 34 deletions

diff --git a/examples/quick/demos/stocqt/content/StockListModel.qml b/examples/quick/demos/stocqt/content/StockListModel.qml
index 9b48124bda..02ece32a49 100644
--- a/examples/quick/demos/stocqt/content/StockListModel.qml
+++ b/examples/quick/demos/stocqt/content/StockListModel.qml
@@ -82,27 +82,28 @@ ListModel {
         xhr.onreadystatechange = function() {
             if (xhr.readyState === XMLHttpRequest.LOADING || xhr.readyState === XMLHttpRequest.DONE) {
                 var records = xhr.responseText.split('\n');
+                var unknown = "n/a";
+                set(index, {"value": unknown, "change": unknown, "changePercentage": unknown});
                 if (records.length > 0 && xhr.status == 200) {
                     var r = records[1].split(',');
                     var today = parseFloat(r[4]);
-                    setProperty(index, "value", today.toFixed(2));
+                    if (!isNaN(today))
+                        setProperty(index, "value", today.toFixed(2));
+                    if (records.length > 2) {
+                        r = records[2].split(',');
+                        var yesterday = parseFloat(r[4]);
+                        var change = today - yesterday;
+                        if (change >= 0.0)
+                            setProperty(index, "change", "+" + change.toFixed(2));
+                        else
+                            setProperty(index, "change", change.toFixed(2));
 
-                    r = records[2].split(',');
-                    var yesterday = parseFloat(r[4]);
-                    var change = today - yesterday;
-                    if (change >= 0.0)
-                        setProperty(index, "change", "+" + change.toFixed(2));
-                    else
-                        setProperty(index, "change", change.toFixed(2));
-
-                    var changePercentage = (change / yesterday) * 100.0;
-                    if (changePercentage >= 0.0)
-                        setProperty(index, "changePercentage", "+" + changePercentage.toFixed(2) + "%");
-                    else
-                        setProperty(index, "changePercentage", changePercentage.toFixed(2) + "%");
-                } else {
-                    var unknown = "n/a";
-                    set(index, {"value": unknown, "change": unknown, "changePercentage": unknown});
+                        var changePercentage = (change / yesterday) * 100.0;
+                        if (changePercentage >= 0.0)
+                            setProperty(index, "changePercentage", "+" + changePercentage.toFixed(2) + "%");
+                        else
+                            setProperty(index, "changePercentage", changePercentage.toFixed(2) + "%");
+                    }
                 }
             }
         }
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
diff --git a/examples/quick/rendercontrol/window_singlethreaded.cpp b/examples/quick/rendercontrol/window_singlethreaded.cpp
index ef8f2fed43..bd4de9a7cb 100644
--- a/examples/quick/rendercontrol/window_singlethreaded.cpp
+++ b/examples/quick/rendercontrol/window_singlethreaded.cpp
@@ -82,6 +82,10 @@ WindowSingleThreaded::WindowSingleThreaded()
 {
     setSurfaceType(QSurface::OpenGLSurface);
 
+    // The rendercontrol does not necessarily need an FBO. Demonstrate this
+    // when requested.
+    m_onscreen = QCoreApplication::arguments().contains(QStringLiteral("--onscreen"));
+
     QSurfaceFormat format;
     // Qt Quick may need a depth and stencil buffer. Always make sure these are available.
     format.setDepthBufferSize(16);
@@ -164,8 +168,14 @@ void WindowSingleThreaded::createFbo()
     // The scene graph has been initialized. It is now time to create an FBO and associate
     // it with the QQuickWindow.
     m_dpr = devicePixelRatio();
-    m_fbo = new QOpenGLFramebufferObject(size() * m_dpr, QOpenGLFramebufferObject::CombinedDepthStencil);
-    m_quickWindow->setRenderTarget(m_fbo);
+    if (!m_onscreen) {
+        m_fbo = new QOpenGLFramebufferObject(size() * m_dpr, QOpenGLFramebufferObject::CombinedDepthStencil);
+        m_quickWindow->setRenderTarget(m_fbo);
+    } else {
+        // Special case: No FBO. Render directly to the window's default framebuffer.
+        m_onscreenSize = size() * m_dpr;
+        m_quickWindow->setRenderTarget(0, m_onscreenSize);
+    }
 }
 
 void WindowSingleThreaded::destroyFbo()
@@ -176,7 +186,10 @@ void WindowSingleThreaded::destroyFbo()
 
 void WindowSingleThreaded::render()
 {
-    if (!m_context->makeCurrent(m_offscreenSurface))
+    QSurface *surface = m_offscreenSurface;
+    if (m_onscreen)
+        surface = this;
+    if (!m_context->makeCurrent(surface))
         return;
 
     // Polish, synchronize and render the next frame (into our fbo).  In this example
@@ -195,7 +208,10 @@ void WindowSingleThreaded::render()
     m_quickReady = true;
 
     // Get something onto the screen.
-    m_cubeRenderer->render(this, m_context, m_quickReady ? m_fbo->texture() : 0);
+    if (!m_onscreen)
+        m_cubeRenderer->render(this, m_context, m_quickReady ? m_fbo->texture() : 0);
+    else
+        m_context->swapBuffers(this);
 }
 
 void WindowSingleThreaded::requestUpdate()
@@ -237,7 +253,10 @@ void WindowSingleThreaded::run()
     updateSizes();
 
     // Initialize the render control and our OpenGL resources.
-    m_context->makeCurrent(m_offscreenSurface);
+    QSurface *surface = m_offscreenSurface;
+    if (m_onscreen)
+        surface = this;
+    m_context->makeCurrent(surface);
     m_renderControl->initialize(m_context);
     m_quickInitialized = true;
 }
@@ -266,7 +285,8 @@ void WindowSingleThreaded::exposeEvent(QExposeEvent *)
 {
     if (isExposed()) {
         if (!m_quickInitialized) {
-            m_cubeRenderer->render(this, m_context, m_quickReady ? m_fbo->texture() : 0);
+            if (!m_onscreen)
+                m_cubeRenderer->render(this, m_context, m_quickReady ? m_fbo->texture() : 0);
             startQuick(QStringLiteral("qrc:/rendercontrol/demo.qml"));
         }
     }
@@ -274,7 +294,10 @@ void WindowSingleThreaded::exposeEvent(QExposeEvent *)
 
 void WindowSingleThreaded::resizeFbo()
 {
-    if (m_rootItem && m_context->makeCurrent(m_offscreenSurface)) {
+    QSurface *surface = m_offscreenSurface;
+    if (m_onscreen)
+        surface = this;
+    if (m_rootItem && m_context->makeCurrent(surface)) {
         delete m_fbo;
         createFbo();
         m_context->doneCurrent();
@@ -287,8 +310,13 @@ void WindowSingleThreaded::resizeEvent(QResizeEvent *)
 {
     // If this is a resize after the scene is up and running, recreate the fbo and the
     // Quick item and scene.
-    if (m_fbo && m_fbo->size() != size() * devicePixelRatio())
-        resizeFbo();
+    if (!m_onscreen) {
+        if (m_fbo && m_fbo->size() != size() * devicePixelRatio())
+            resizeFbo();
+    } else {
+        if (m_onscreenSize != size() * devicePixelRatio())
+            resizeFbo();
+    }
 }
 
 void WindowSingleThreaded::handleScreenChange()
diff --git a/examples/quick/rendercontrol/window_singlethreaded.h b/examples/quick/rendercontrol/window_singlethreaded.h
index 534d6b9bc3..4736f036ad 100644
--- a/examples/quick/rendercontrol/window_singlethreaded.h
+++ b/examples/quick/rendercontrol/window_singlethreaded.h
@@ -97,6 +97,8 @@ private:
     QTimer m_updateTimer;
     CubeRenderer *m_cubeRenderer;
     qreal m_dpr;
+    bool m_onscreen;
+    QSize m_onscreenSize;
 };
 
 #endif