Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"

src/imports/quick3d/doc/src/qtquick3d-helpers.qdoc

@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \qmlmodule QtQuick3D.Helpers
+    \qmlmodule QtQuick3D.Helpers 1.\QtMinorVersion
     \title Qt Quick 3D Helpers QML Types
     \brief Module containing helpers for creating applications using Qt Quick 3D.
 

src/imports/quick3d/doc/src/qtquick3d-materials.qdoc

@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \qmlmodule QtQuick3D.Materials
+    \qmlmodule QtQuick3D.Materials 1.\QtMinorVersion
     \title Qt Quick 3D Materials QML Types
     \brief Provides QML types for the materials included in the Qt Quick 3D
            material library.

src/imports/quick3d/doc/src/qtquick3d-qmlmodule.qdoc

@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-\qmlmodule QtQuick3D 1.0
+\qmlmodule QtQuick3D 1.\QtMinorVersion
 \title Qt Quick 3D QML Types
 \brief Provides the QML types to include 3D items into a Qt Quick scene.
 

src/plugins/assetimporters/assetimporters.pro

@@ -3,6 +3,6 @@ TEMPLATE = subdirs
 SUBDIRS = \
     uip
 
-qtConfig(assimp):{
+qtConfig(quick3d-assimp): {
     SUBDIRS += assimp
 }

src/plugins/assetimporters/configure.json

@@ -4,12 +4,12 @@
 
     "commandline": {
         "options": {
-            "assimp": { "type": "enum", "values": [ "no", "qt", "system" ] }
+            "quick3d-assimp": { "type": "enum", "values": [ "no", "qt", "system" ] }
         }
     },
 
     "libraries": {
-        "assimp": {
+        "quick3d-assimp": {
             "label": "Assimp",
             "test": "assimp",
             "sources": [
@@ -20,15 +20,15 @@
     },
 
     "features": {
-        "assimp": {
+        "quick3d-assimp": {
             "label": "Assimp",
             "output": [ "privateFeature", "feature" ]
         },
         "system-assimp": {
             "label": "System Assimp",
-            "enable": "input.assimp == 'system'",
-            "disable": "input.assimp == 'qt'",
-            "condition": "features.assimp && libs.assimp",
+            "enable": "input.quick3d-assimp == 'system'",
+            "disable": "input.quick3d-assimp == 'qt'",
+            "condition": "features.quick3d-assimp && libs.quick3d-assimp",
             "output": [ "privateFeature" ]
         }
     },
@@ -40,7 +40,7 @@
         {
             "section": "QtQuick3D",
             "entries": [
-                "assimp",
+                "quick3d-assimp",
                 "system-assimp"
             ]
         }