summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-02-13 14:47:10 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-02-13 18:42:46 +0000
commit8b90be308d31f1efada42a08d676569683637837 (patch)
treef3c4b2a22d92ffa551d270b9fb44325727a71e26
parent209efae5307bf6cf519848205dbbe637c62c4ae2 (diff)
Remove failing converter registration
The QJSValue -> QVariantList converter will not be registered because there is such a conversion provided by qtdeclarative since Qt 5.4. This avoids a warning on startup. Change-Id: I69572f36f655315d4c91000a26625f44690dcd6f Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/quick3d/imports/render/qt3dquick3drenderplugin.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 2065e39a4..2a8e7075d 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -124,18 +124,6 @@ static const struct {
{ "ForwardRenderer", 2, 0 }
};
-QVariantList QJSValueToVariantListConverter(const QJSValue &jsValue)
-{
- QVariantList values;
- QJSValueIterator it(jsValue);
- while (it.hasNext()) {
- it.next();
- if (it.hasNext()) // The last element in an Array is the count, which we don't want
- values << it.value().toVariant();
- }
- return values;
-}
-
QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3D::Render::Quick::Quick3DShaderDataArray *array)
{
QList<Qt3D::QShaderData *> arrayValues = array->values();
@@ -151,8 +139,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
// Init resources for defaults QML files
initResources();
- // Converters from QJSValue
- QMetaType::registerConverter<QJSValue, QVariantList>(QJSValueToVariantListConverter);
+ // Converters
QMetaType::registerConverter<Qt3D::Render::Quick::Quick3DShaderDataArray*, QVariantList>(Quick3DShaderDataArrayToVariantListConverter);
// @uri Qt3D.Render