1 files changed, 15 insertions, 11 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
index a82b88f36f..3663e49f10 100644
--- a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
+++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_canvas);
+
 #include <QtCore/qmutex.h>
 #include "qquickcontext2d_p.h"
 
@@ -70,7 +74,7 @@ public:
     inline int size() {return commands.size();}
     inline bool isEmpty() const {return commands.isEmpty(); }
     inline bool hasNext() const {return cmdIdx < commands.size(); }
-    inline QQuickContext2D::PaintCommand takeNextCommand() { return commands[cmdIdx++]; }
+    inline QQuickContext2D::PaintCommand takeNextCommand() { return commands.at(cmdIdx++); }
 
     inline qreal takeGlobalAlpha() { return takeReal(); }
     inline QPainter::CompositionMode takeGlobalCompositeOperation(){ return static_cast<QPainter::CompositionMode>(takeInt()); }
@@ -227,20 +231,20 @@ public:
         colors << color;
     }
 
-    inline QTransform takeMatrix() { return matrixes[matrixIdx++]; }
+    inline QTransform takeMatrix() { return matrixes.at(matrixIdx++); }
 
-    inline QRectF takeRect() { return rects[rectIdx++]; }
+    inline QRectF takeRect() { return rects.at(rectIdx++); }
 
-    inline QPainterPath takePath() { return pathes[pathIdx++]; }
+    inline QPainterPath takePath() { return pathes.at(pathIdx++); }
 
-    inline const QImage& takeImage() { return images[imageIdx++]; }
-    inline QQmlRefPointer<QQuickCanvasPixmap> takePixmap() { return pixmaps[pixmapIdx++]; }
+    inline const QImage& takeImage() { return images.at(imageIdx++); }
+    inline QQmlRefPointer<QQuickCanvasPixmap> takePixmap() { return pixmaps.at(pixmapIdx++); }
 
-    inline int takeInt() { return ints[intIdx++]; }
-    inline bool takeBool() {return bools[boolIdx++]; }
-    inline qreal takeReal() { return reals[realIdx++]; }
-    inline QColor takeColor() { return colors[colorIdx++]; }
-    inline QBrush takeBrush() { return brushes[brushIdx++]; }
+    inline int takeInt() { return ints.at(intIdx++); }
+    inline bool takeBool() {return bools.at(boolIdx++); }
+    inline qreal takeReal() { return reals.at(realIdx++); }
+    inline QColor takeColor() { return colors.at(colorIdx++); }
+    inline QBrush takeBrush() { return brushes.at(brushIdx++); }
 
     void replay(QPainter* painter, QQuickContext2D::State& state, const QVector2D &scaleFactor);