Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

3 files changed, 5 insertions, 49 deletions

diff --git a/src/imports/wavefrontmesh/plugin.cpp b/src/imports/wavefrontmesh/plugin.cpp
index 937d3a8ff0..9bb7a45b2f 100644
--- a/src/imports/wavefrontmesh/plugin.cpp
+++ b/src/imports/wavefrontmesh/plugin.cpp
@@ -44,23 +44,15 @@
 
 QT_BEGIN_NAMESPACE
 
-class QmlWavefrontMeshPlugin : public QQmlExtensionPlugin
+class QmlWavefrontMeshPlugin : public QQmlEngineExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+    Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid)
 public:
     QmlWavefrontMeshPlugin(QObject *parent = nullptr)
-        : QQmlExtensionPlugin(parent)
+        : QQmlEngineExtensionPlugin(parent)
     {
     }
-
-    void registerTypes(const char *uri) override
-    {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.wavefrontmesh"));
-        qmlRegisterTypesAndRevisions<QWavefrontMesh>(uri, 1);
-
-        qmlRegisterModule(uri, 1, 15);
-    }
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/wavefrontmesh/plugins.qmltypes b/src/imports/wavefrontmesh/plugins.qmltypes
deleted file mode 100644
index 4e6a1dca73..0000000000
--- a/src/imports/wavefrontmesh/plugins.qmltypes
+++ /dev/null
@@ -1,37 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Qt.labs.wavefrontmesh 1.14'
-
-Module {
-    dependencies: ["QtQuick 2.0"]
-    Component {
-        name: "QWavefrontMesh"
-        prototype: "QQuickShaderEffectMesh"
-        exports: ["Qt.labs.wavefrontmesh/WavefrontMesh 1.0"]
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "Error"
-            values: {
-                "NoError": 0,
-                "InvalidSourceError": 1,
-                "UnsupportedFaceShapeError": 2,
-                "UnsupportedIndexSizeError": 3,
-                "FileNotFoundError": 4,
-                "NoAttributesError": 5,
-                "MissingPositionAttributeError": 6,
-                "MissingTextureCoordinateAttributeError": 7,
-                "MissingPositionAndTextureCoordinateAttributesError": 8,
-                "TooManyAttributesError": 9,
-                "InvalidPlaneDefinitionError": 10
-            }
-        }
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "lastError"; type: "Error"; isReadonly: true }
-        Property { name: "projectionPlaneV"; type: "QVector3D" }
-        Property { name: "projectionPlaneW"; type: "QVector3D" }
-    }
-}
diff --git a/src/imports/wavefrontmesh/wavefrontmesh.pro b/src/imports/wavefrontmesh/wavefrontmesh.pro
index 85bd500089..f6d93b867d 100644
--- a/src/imports/wavefrontmesh/wavefrontmesh.pro
+++ b/src/imports/wavefrontmesh/wavefrontmesh.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = qmlwavefrontmeshplugin
 TARGETPATH = Qt/labs/wavefrontmesh
-IMPORT_VERSION = 1.$$QT_MINOR_VERSION
+IMPORT_VERSION = 1.15
 
 QT = core-private qml-private quick-private
 
@@ -12,4 +12,5 @@ SOURCES += \
 HEADERS += \
     qwavefrontmesh.h
 
+CONFIG += qmltypes install_qmltypes
 load(qml_plugin)