Refactor context2d thread logic

1. Use QQuickContext2DRenderThread for Threaded rendering
2. Make FBO target works with all render strategies
3. Remove some unnessary locks, call texture methods by invoking meta calls
4. Run existing tests with all render targets and strategies (except Cooperative)

Change-Id: I0db5c91d848b86bcc1536c30d7a5804b66a817f1
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_image.qml b/tests/auto/quick/qquickcanvasitem/data/tst_image.qml
index 71931acae8..72b6dcdb00 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_image.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_image.qml
@@ -653,7 +653,7 @@ CanvasTestCase {
        var ctx = canvas.getContext('2d');
        loadImages(canvas);
 
-       var canvas2 = Qt.createQmlObject("import QtQuick 2.0; Canvas{renderTarget:Canvas.Image}", canvas);
+       var canvas2 = Qt.createQmlObject("import QtQuick 2.0; Canvas{renderTarget:Canvas.Image; renderStrategy:Canvas.Immediate}", canvas);
        canvas2.width = 100;
        canvas2.height = 50;
        var ctx2 = canvas2.getContext('2d');
@@ -704,4 +704,4 @@ CanvasTestCase {
        comparePixel(ctx, 25,25, 255,0,0,255, 2);
        comparePixel(ctx, 75,25, 255,0,0,255, 2);
    }
-}
\ No newline at end of file
+}