Updated plugins.qmltypes

Also updated autotests.

Change-Id: Iaeee82e40c63b2671843f40be14ac838d50b7715
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>

src/plugins.qmltypes

@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump.exe -nonrelocatable QtCanvas3D 1.0'
+// 'qmlplugindump -nonrelocatable QtCanvas3D 1.0'
 
 Module {
     Component {
@@ -14,11 +14,9 @@ Module {
         exports: ["QtCanvas3D/Canvas3D 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "context"; type: "CanvasContext"; isReadonly: true; isPointer: true }
-        Property { name: "animated"; type: "bool" }
         Property { name: "logAllCalls"; type: "bool" }
         Property { name: "logAllErrors"; type: "bool" }
         Property { name: "devicePixelRatio"; type: "float"; isReadonly: true }
-        Property { name: "imageLoader"; type: "CanvasTextureImageLoader"; isPointer: true }
         Signal { name: "needRender" }
         Signal {
             name: "devicePixelRatioChanged"
@@ -28,10 +26,6 @@ Module {
             name: "animatedChanged"
             Parameter { name: "animated"; type: "bool" }
         }
-        Signal {
-            name: "imageLoaderChanged"
-            Parameter { name: "loader"; type: "CanvasTextureImageLoader"; isPointer: true }
-        }
         Signal {
             name: "logAllCallsChanged"
             Parameter { name: "logCalls"; type: "bool" }
@@ -95,7 +89,7 @@ Module {
         }
         Signal {
             name: "nameChanged"
-            Parameter { name: "name"; type: "QString&" }
+            Parameter { name: "name"; type: "string" }
         }
     }
     Component {
@@ -157,7 +151,7 @@ Module {
     }
     Component {
         name: "CanvasContext"
-        prototype: "QObject"
+        prototype: "CanvasAbstractObject"
         exports: ["QtCanvas3D/Context3D 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
@@ -1740,7 +1734,7 @@ Module {
     }
     Component {
         name: "CanvasContextAttributes"
-        prototype: "QObject"
+        prototype: "CanvasAbstractObject"
         exports: ["QtCanvas3D/ContextAttributes 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "alpha"; type: "bool" }
@@ -1908,21 +1902,21 @@ Module {
     }
     Component {
         name: "CanvasRenderBuffer"
-        prototype: "QObject"
+        prototype: "CanvasAbstractObject"
         exports: ["QtCanvas3D/RenderBuffer3D 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
     }
     Component {
         name: "CanvasShader"
-        prototype: "QObject"
+        prototype: "CanvasAbstractObject"
         exports: ["QtCanvas3D/Shader3D 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
     }
     Component {
         name: "CanvasShaderPrecisionFormat"
-        prototype: "QObject"
+        prototype: "CanvasAbstractObject"
         exports: ["QtCanvas3D/ShaderPrecisionFormat 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
@@ -1964,13 +1958,13 @@ Module {
                 "LOADING_ERROR": 4
             }
         }
-        Property { name: "source"; type: "QUrl" }
+        Property { name: "src"; type: "QUrl" }
         Property { name: "imageState"; type: "TextureImageState"; isReadonly: true }
         Property { name: "width"; type: "int"; isReadonly: true }
         Property { name: "height"; type: "int"; isReadonly: true }
         Property { name: "errorString"; type: "string"; isReadonly: true }
         Signal {
-            name: "sourceChanged"
+            name: "srcChanged"
             Parameter { name: "source"; type: "QUrl" }
         }
         Signal {
@@ -1993,32 +1987,36 @@ Module {
             name: "anythingChanged"
             Parameter { name: "value"; type: "QVariant"; isPointer: true }
         }
-        Method { name: "id"; type: "ulong" }
-    }
-    Component {
-        name: "CanvasTextureImageLoader"
-        prototype: "QObject"
-        exports: ["QtCanvas3D/TextureImageLoader 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "image"; type: "CanvasTextureImage"; isReadonly: true; isPointer: true }
-        Property { name: "logAllCalls"; type: "bool" }
-        Property { name: "logAllErrors"; type: "bool" }
-        Signal { name: "imageLoaded" }
-        Signal { name: "imageLoadingFailed" }
         Signal {
-            name: "logAllCallsChanged"
-            Parameter { name: "logCalls"; type: "bool" }
+            name: "imageLoadingStarted"
+            Parameter { name: "image"; type: "CanvasTextureImage"; isPointer: true }
         }
         Signal {
-            name: "logAllErrorsChanged"
-            Parameter { name: "logErrors"; type: "bool" }
+            name: "imageLoaded"
+            Parameter { name: "image"; type: "CanvasTextureImage"; isPointer: true }
         }
+        Signal {
+            name: "imageLoadingFailed"
+            Parameter { name: "image"; type: "CanvasTextureImage"; isPointer: true }
+        }
+        Method { name: "create"; type: "CanvasTextureImage*" }
+        Method { name: "id"; type: "ulong" }
         Method {
-            name: "loadImage"
+            name: "resize"
             type: "CanvasTextureImage*"
-            Parameter { name: "url"; type: "QUrl" }
+            Parameter { name: "width"; type: "int" }
+            Parameter { name: "height"; type: "int" }
         }
     }
+    Component {
+        name: "CanvasTextureImageFactory"
+        prototype: "QObject"
+        exports: ["QtCanvas3D/TextureImageFactory 1.0"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Method { name: "newTexImage"; type: "CanvasTextureImage*" }
+    }
     Component {
         name: "CanvasTypedArray"
         prototype: "CanvasArrayBufferView"
@@ -2227,7 +2225,6 @@ Module {
             Parameter { name: "buffer"; type: "CanvasArrayBuffer"; isPointer: true }
             Parameter { name: "byteOffset"; type: "ulong" }
         }
-        Method { name: "newTexImage"; type: "CanvasTextureImage*" }
     }
     Component {
         name: "CanvasUint16Array"

tests/auto/qmltest/canvas3d/tst_canvas3d.qml

@@ -58,18 +58,6 @@ Item {
         logAllErrors: false
     }
 
-    Canvas3D {
-        id: animated
-        animated: true
-    }
-
-    Canvas3D {
-        id: imageloader
-        imageLoader: TextureImageLoader {
-            id: loader
-        }
-    }
-
     Canvas3D {
         id: basic_context
         anchors.fill: parent
@@ -100,8 +88,6 @@ Item {
             compare(empty.height, 0)
             compare(empty.logAllCalls, false)
             compare(empty.logAllErrors, true)
-            compare(empty.animated, false)
-            compare(empty.imageLoader, null)
             compare(empty.context, null)
         }
 
@@ -116,14 +102,6 @@ Item {
             compare(no_logs.logAllErrors, false)
         }
 
-        function test_animated() {
-            compare(animated.animated, true)
-        }
-
-        function test_imageloader() {
-            compare(imageloader.imageLoader, loader)
-        }
-
         function test_basic_context() {
             waitForRendering(basic_context)
             basic_context.getContext("basic")