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

Change-Id: I05f4e29dd3435bb843f9b2250574a61d688d5992

1 files changed, 25 insertions, 4 deletions

diff --git a/examples/quick/demos/stocqt/content/StockChart.qml b/examples/quick/demos/stocqt/content/StockChart.qml
index 147f513456..cd8b9f3db9 100644
--- a/examples/quick/demos/stocqt/content/StockChart.qml
+++ b/examples/quick/demos/stocqt/content/StockChart.qml
@@ -321,11 +321,27 @@ Rectangle {
             ctx.restore();
         }
 
-        onPaint: {
-            if (!stockModel.ready) {
-                return;
-            }
+        function drawError(ctx, msg)
+        {
+            ctx.save();
+            ctx.strokeStyle = "#888888";
+            ctx.font = "24px Open Sans"
+            ctx.textAlign = "center"
+            ctx.shadowOffsetX = 4;
+            ctx.shadowOffsetY = 4;
+            ctx.shadowBlur = 1.5;
+            ctx.shadowColor = "#aaaaaa";
+            ctx.beginPath();
 
+            ctx.fillText(msg, (canvas.width - tickMargin) / 2,
+                              (canvas.height - yGridOffset - yGridStep) / 2);
+
+            ctx.closePath();
+            ctx.stroke();
+            ctx.restore();
+        }
+
+        onPaint: {
             numPoints = stockModel.indexOf(chart.startDate);
 
             if (chart.gridSize == 0)
@@ -337,6 +353,11 @@ Rectangle {
 
             drawBackground(ctx);
 
+            if (!stockModel.ready) {
+                drawError(ctx, "No data available.");
+                return;
+            }
+
             var highestPrice = 0;
             var highestVolume = 0;
             var lowestPrice = -1;