From c9dbd1025cf31ca512ff29a169970275b76752dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A4=C3=A4tt=C3=A4=20Antti?= <antti.maatta@qt.io>
Date: Fri, 12 May 2017 14:45:27 +0300
Subject: Fix qmlClearTypeRegistrations for Qt 3D

Unregister valueTypeProvider in qtquick_global.cpp to prevent multiple
registrations. The Quick3DColorProvider doesn't seem to cause problems
so leave as it is.

Task-number: QTBUG-56546
Change-Id: I79139d8e8ab80458e72633dd97e15dbf108388e4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp')

diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index 6d2a78166..3ff63d9d9 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -71,4 +71,9 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
     qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNodeV9, 9>(uri, 2, 9, "Node", QStringLiteral("Node is a base class"));
 }
 
+Qt3DQuick3DCorePlugin::~Qt3DQuick3DCorePlugin()
+{
+    Qt3DCore::Quick::Quick3D_uninitialize();
+}
+
 QT_END_NAMESPACE
-- 
cgit v1.2.3