Release housekeeping

- Changed the version number to 1.2 where relevant.
- Regenerated plugins.qmltypes
- Updated known issues

Change-Id: I5f737a970d0ac7fc14dbd2d30a8684ecced45ac0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

12 files changed, 317 insertions, 80 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 4ac38ae2..48e733ed 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,6 +1,6 @@
 load(qt_build_config)
 CONFIG += qt_example_installs
 
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.2.0
 
 CMAKE_MODULE_TESTS=-
diff --git a/README b/README
index 357507d5..2c548feb 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 ---------------------------
-Qt Data Visualization 1.1.0
+Qt Data Visualization 1.2.0
 ---------------------------
 
 Qt Data Visualization module provides multiple graph types to visualize data in 3D space
@@ -78,12 +78,14 @@ Known Issues
   so only the Qt Quick 2 versions of graphs are available in practice for those platforms.
 - Shadows are not supported with OpenGL ES2 (including Angle builds in Windows).
 - Anti-aliasing doesn't work with OpenGL ES2 (including Angle builds in Windows).
+- QCustom3DVolume items are not supported with OpenGL ES2 (including Angle builds in Windows).
 - Surfaces with non-straight rows and columns do not always render properly.
 - Q3DLight class (and Light3D QML item) are currently not usable for anything.
-- Changing any of Q3DScene properties affecting subviewports currently has no effect.
+- Changing most of Q3DScene properties affecting subviewports currently has no effect.
 - Widget based examples layout incorrectly in iOS.
 - Reparenting a graph to an item in another QQuickWindow is not supported.
-- There is a low-impact binary break between 1.0 and 1.1. The break is due to a QML type
-  registration conflict with QAbstractItemModel between QtDataVisualization and
-  QtCommercial.Charts. Introducing the binary break makes it possible to use both
-  Charts and Data Visualization in the same QML application.
+- Android builds of QML applications importing QtDataVisualization also require
+  "QT += datavisualization" in the pro file. This is because Qt Data Visualization QML plugin has
+  a dependency to Qt Data Visualization C++ library, which Qt Creator doesn't automatically add
+  to the deployment package.
+
diff --git a/dist/changes-1.2.0 b/dist/changes-1.2.0
index cd0f6ec4..b23d83b1 100644
--- a/dist/changes-1.2.0
+++ b/dist/changes-1.2.0
@@ -62,6 +62,8 @@ General:
 - Fixed the OpenGL context cleanup upon renderer destruction.
 - Fixed scatter item autosizing when adding a new series.
 - Fixed a crash related to selection render buffer reuse.
+- Fixed the flipped Z-coordinate for absolutely positioned custom items.
+- Fixed shadows when viewing the graph directly from above or below.
 
 New examples
 ------------
diff --git a/qtdatavisualization.pro b/qtdatavisualization.pro
index bb98435e..faadadbc 100644
--- a/qtdatavisualization.pro
+++ b/qtdatavisualization.pro
@@ -8,4 +8,4 @@ contains(QT_CONFIG, opengles1) {
     error(QtDataVisualization does not support OpenGL ES 1!)
 }
 
-OTHER_FILES += README dist/*
+OTHER_FILES += README dist/* .qmake.conf
diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf
index 6c4b44d9..4d63b526 100644
--- a/src/datavisualization/doc/qtdatavisualization.qdocconf
+++ b/src/datavisualization/doc/qtdatavisualization.qdocconf
@@ -6,7 +6,7 @@ include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
 
 project             = QtDataVisualization
 description         = Qt Data Visualization Reference Documentation
-version             = 1.1.0
+version             = 1.2.0
 
 exampledirs += ../../../examples/datavisualization \
                snippets
@@ -27,14 +27,14 @@ indexes +=  $QT_INSTALL_DOCS/qtcore/qtcore.index \
 qhp.projects                            = QtDataVisualization
 
 qhp.QtDataVisualization.file            = qtdatavisualization.qhp
-qhp.QtDataVisualization.namespace       = com.digia.qtdatavisualization.110
+qhp.QtDataVisualization.namespace       = com.digia.qtdatavisualization.120
 qhp.QtDataVisualization.virtualFolder   = qtdatavisualization
 qhp.QtDataVisualization.indexTitle      = Qt Data Visualization
 qhp.QtDataVisualization.indexRoot       =
 
-qhp.QtDataVisualization.filterAttributes                        = qtdatavisualization 1.1.0 qtrefdoc
-qhp.QtDataVisualization.customFilters.Qt.name                   = QtDataVisualization 1.1.0
-qhp.QtDataVisualization.customFilters.Qt.filterAttributes       = qtdatavisualization 1.1.0
+qhp.QtDataVisualization.filterAttributes                        = qtdatavisualization 1.2.0 qtrefdoc
+qhp.QtDataVisualization.customFilters.Qt.name                   = QtDataVisualization 1.2.0
+qhp.QtDataVisualization.customFilters.Qt.filterAttributes       = qtdatavisualization 1.2.0
 qhp.QtDataVisualization.subprojects                             = gettingstarted examples classes types
 qhp.QtDataVisualization.subprojects.gettingstarted.title        = Getting Started
 qhp.QtDataVisualization.subprojects.gettingstarted.indexTitle   = Qt Data Visualization Getting Started
diff --git a/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp b/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp
index 56bfc5ee..1ca3f597 100644
--- a/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp
+++ b/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp
@@ -17,12 +17,12 @@
 ****************************************************************************/
 
 //! [0]
-import QtDataVisualization 1.1
+import QtDataVisualization 1.2
 //! [0]
 
 //! [1]
 import QtQuick 2.0
-import QtDataVisualization 1.1
+import QtDataVisualization 1.2
 
 Item {
     width: 640
@@ -61,7 +61,7 @@ Item {
 
 //! [2]
 import QtQuick 2.0
-import QtDataVisualization 1.1
+import QtDataVisualization 1.2
 
 Item {
     width: 640
@@ -94,7 +94,7 @@ Item {
 
 //! [3]
 import QtQuick 2.0
-import QtDataVisualization 1.1
+import QtDataVisualization 1.2
 
 Item {
     width: 640
diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc
index ad53ded3..b07074b1 100644
--- a/src/datavisualization/doc/src/qtdatavisualization.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc
@@ -37,7 +37,7 @@
 */
 
 /*!
-    \qmlmodule QtDataVisualization 1.1
+    \qmlmodule QtDataVisualization 1.2
     \title Qt Data Visualization QML Types
     \ingroup qmlmodules
 
@@ -327,16 +327,17 @@
             so only the Qt Quick 2 graphs are available in practice for those platforms.
         \li Shadows are not supported with OpenGL ES2 (including Angle builds in Windows).
         \li Anti-aliasing doesn't work with OpenGL ES2 (including Angle builds in Windows).
-        \li QCustom3DVolume items are not supported with OpenGL ES2 (including Angle builds in Windows).
+        \li QCustom3DVolume items are not supported with OpenGL ES2 (including Angle builds in
+            Windows).
         \li Surfaces with non-straight rows and columns do not always render properly.
         \li Q3DLight class (and Light3D QML item) are currently not usable for anything.
-        \li Changing any of Q3DScene properties affecting subviewports currently has no effect.
+        \li Changing most of Q3DScene properties affecting subviewports currently has no effect.
         \li Widget based examples layout incorrectly in iOS.
         \li Reparenting a graph to an item in another QQuickWindow is not supported.
-        \li There is a low-impact binary break between 1.0 and 1.1. The break is due to a QML type
-            registration conflict with QAbstractItemModel between QtDataVisualization and
-            QtCommercial.Charts. Introducing the binary break makes it possible to use both
-            Charts and Data Visualization in the same QML application.
+        \li Android builds of QML applications importing QtDataVisualization also require
+            "QT += datavisualization" in the pro file. This is because Qt Data Visualization
+            QML plugin has a dependency to Qt Data Visualization C++ library, which Qt Creator
+            doesn't automatically add to the deployment package.
     \endlist
 */
 
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h
index e84d03c0..a7f96361 100644
--- a/src/datavisualization/global/qdatavisualizationglobal.h
+++ b/src/datavisualization/global/qdatavisualizationglobal.h
@@ -21,11 +21,11 @@
 
 #include <QtCore/qglobal.h>
 
-#define QT_DATAVISUALIZATION_VERSION_STR   "1.1.0"
+#define QT_DATAVISUALIZATION_VERSION_STR   "1.2.0"
 /*
    QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_DATAVISUALIZATION_VERSION       0x010100
+#define QT_DATAVISUALIZATION_VERSION       0x010200
 /*
    can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 0, 0))
 */
diff --git a/src/datavisualizationqml2/designer/default/Bars3D.qml b/src/datavisualizationqml2/designer/default/Bars3D.qml
index 10fefe53..c85c0e94 100644
--- a/src/datavisualizationqml2/designer/default/Bars3D.qml
+++ b/src/datavisualizationqml2/designer/default/Bars3D.qml
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDataVisualization 1.1
+import QtDataVisualization 1.2
 
 Bars3D {
     width: 300
diff --git a/src/datavisualizationqml2/designer/default/Scatter3D.qml b/src/datavisualizationqml2/designer/default/Scatter3D.qml
index b08d4e24..0bd6cac2 100644
--- a/src/datavisualizationqml2/designer/default/Scatter3D.qml
+++ b/src/datavisualizationqml2/designer/default/Scatter3D.qml
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDataVisualization 1.1
+import QtDataVisualization 1.2
 
 Scatter3D {
     width: 300
diff --git a/src/datavisualizationqml2/designer/default/Surface3D.qml b/src/datavisualizationqml2/designer/default/Surface3D.qml
index 77ee476e..f9de62a1 100644
--- a/src/datavisualizationqml2/designer/default/Surface3D.qml
+++ b/src/datavisualizationqml2/designer/default/Surface3D.qml
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDataVisualization 1.1
+import QtDataVisualization 1.2
 
 Surface3D {
     width: 300
diff --git a/src/datavisualizationqml2/plugins.qmltypes b/src/datavisualizationqml2/plugins.qmltypes
index 6a580536..956100ed 100644
--- a/src/datavisualizationqml2/plugins.qmltypes
+++ b/src/datavisualizationqml2/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 -nonrelocatable QtDataVisualization 1.1'
+// 'qmlplugindump.exe -nonrelocatable QtDataVisualization 1.2'
 
 Module {
     Component {
@@ -13,10 +13,11 @@ Module {
         prototype: "QQuickItem"
         exports: [
             "QtDataVisualization/AbstractGraph3D 1.0",
-            "QtDataVisualization/AbstractGraph3D 1.1"
+            "QtDataVisualization/AbstractGraph3D 1.1",
+            "QtDataVisualization/AbstractGraph3D 1.2"
         ]
         isCreatable: false
-        exportMetaObjectRevisions: [0, 1]
+        exportMetaObjectRevisions: [0, 1, 2]
         Enum {
             name: "SelectionFlag"
             values: {
@@ -113,6 +114,14 @@ Module {
         Property { name: "selectedElement"; revision: 1; type: "ElementType"; isReadonly: true }
         Property { name: "aspectRatio"; revision: 1; type: "double" }
         Property { name: "optimizationHints"; revision: 1; type: "OptimizationHints" }
+        Property { name: "polar"; revision: 2; type: "bool" }
+        Property { name: "radialLabelOffset"; revision: 2; type: "float" }
+        Property { name: "horizontalAspectRatio"; revision: 2; type: "double" }
+        Property { name: "reflection"; revision: 2; type: "bool" }
+        Property { name: "reflectivity"; revision: 2; type: "double" }
+        Property { name: "locale"; revision: 2; type: "QLocale" }
+        Property { name: "queriedGraphPosition"; revision: 2; type: "QVector3D"; isReadonly: true }
+        Property { name: "margin"; revision: 2; type: "double" }
         Signal {
             name: "selectionModeChanged"
             Parameter { name: "mode"; type: "AbstractDeclarative::SelectionFlags" }
@@ -175,6 +184,46 @@ Module {
             revision: 1
             Parameter { name: "hints"; type: "AbstractDeclarative::OptimizationHints" }
         }
+        Signal {
+            name: "polarChanged"
+            revision: 2
+            Parameter { name: "enabled"; type: "bool" }
+        }
+        Signal {
+            name: "radialLabelOffsetChanged"
+            revision: 2
+            Parameter { name: "offset"; type: "float" }
+        }
+        Signal {
+            name: "horizontalAspectRatioChanged"
+            revision: 2
+            Parameter { name: "ratio"; type: "double" }
+        }
+        Signal {
+            name: "reflectionChanged"
+            revision: 2
+            Parameter { name: "enabled"; type: "bool" }
+        }
+        Signal {
+            name: "reflectivityChanged"
+            revision: 2
+            Parameter { name: "reflectivity"; type: "double" }
+        }
+        Signal {
+            name: "localeChanged"
+            revision: 2
+            Parameter { name: "locale"; type: "QLocale" }
+        }
+        Signal {
+            name: "queriedGraphPositionChanged"
+            revision: 2
+            Parameter { name: "data"; type: "QVector3D" }
+        }
+        Signal {
+            name: "marginChanged"
+            revision: 2
+            Parameter { name: "margin"; type: "double" }
+        }
         Method {
             name: "handleAxisXChanged"
             Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
@@ -191,6 +240,7 @@ Module {
             name: "windowDestroyed"
             Parameter { name: "obj"; type: "QObject"; isPointer: true }
         }
+        Method { name: "destroyContext" }
         Method { name: "clearSelection" }
         Method {
             name: "addCustomItem"
@@ -247,9 +297,12 @@ Module {
     Component {
         name: "QtDataVisualization::Declarative3DScene"
         prototype: "QtDataVisualization::Q3DScene"
-        exports: ["QtDataVisualization/Scene3D 1.0"]
+        exports: [
+            "QtDataVisualization/Scene3D 1.0",
+            "QtDataVisualization/Scene3D 1.2"
+        ]
         isCreatable: false
-        exportMetaObjectRevisions: [0]
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "selectionQueryPosition"; type: "QPointF" }
         Property { name: "invalidSelectionPoint"; type: "QPoint"; isReadonly: true }
         Signal {
@@ -293,18 +346,22 @@ Module {
         name: "QtDataVisualization::DeclarativeBars"
         defaultProperty: "seriesList"
         prototype: "QtDataVisualization::AbstractDeclarative"
-        exports: ["QtDataVisualization/Bars3D 1.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtDataVisualization/Bars3D 1.0",
+            "QtDataVisualization/Bars3D 1.2"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "rowAxis"; type: "QCategory3DAxis"; isPointer: true }
         Property { name: "valueAxis"; type: "QValue3DAxis"; isPointer: true }
         Property { name: "columnAxis"; type: "QCategory3DAxis"; isPointer: true }
         Property { name: "multiSeriesUniform"; type: "bool" }
-        Property { name: "barThickness"; type: "double" }
+        Property { name: "barThickness"; type: "float" }
         Property { name: "barSpacing"; type: "QSizeF" }
         Property { name: "barSpacingRelative"; type: "bool" }
         Property { name: "seriesList"; type: "QBar3DSeries"; isList: true; isReadonly: true }
         Property { name: "selectedSeries"; type: "QBar3DSeries"; isReadonly: true; isPointer: true }
         Property { name: "primarySeries"; type: "QBar3DSeries"; isPointer: true }
+        Property { name: "floorLevel"; revision: 1; type: "float" }
         Signal {
             name: "rowAxisChanged"
             Parameter { name: "axis"; type: "QCategory3DAxis"; isPointer: true }
@@ -323,7 +380,7 @@ Module {
         }
         Signal {
             name: "barThicknessChanged"
-            Parameter { name: "thicknessRatio"; type: "double" }
+            Parameter { name: "thicknessRatio"; type: "float" }
         }
         Signal {
             name: "barSpacingChanged"
@@ -345,6 +402,11 @@ Module {
             name: "selectedSeriesChanged"
             Parameter { name: "series"; type: "QBar3DSeries"; isPointer: true }
         }
+        Signal {
+            name: "floorLevelChanged"
+            revision: 1
+            Parameter { name: "level"; type: "float" }
+        }
         Method {
             name: "handleAxisXChanged"
             Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
@@ -461,13 +523,17 @@ Module {
         name: "QtDataVisualization::DeclarativeSurface"
         defaultProperty: "seriesList"
         prototype: "QtDataVisualization::AbstractDeclarative"
-        exports: ["QtDataVisualization/Surface3D 1.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtDataVisualization/Surface3D 1.0",
+            "QtDataVisualization/Surface3D 1.2"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "axisX"; type: "QValue3DAxis"; isPointer: true }
         Property { name: "axisY"; type: "QValue3DAxis"; isPointer: true }
         Property { name: "axisZ"; type: "QValue3DAxis"; isPointer: true }
         Property { name: "selectedSeries"; type: "QSurface3DSeries"; isReadonly: true; isPointer: true }
         Property { name: "seriesList"; type: "QSurface3DSeries"; isList: true; isReadonly: true }
+        Property { name: "flipHorizontalGrid"; revision: 1; type: "bool" }
         Signal {
             name: "axisXChanged"
             Parameter { name: "axis"; type: "QValue3DAxis"; isPointer: true }
@@ -484,6 +550,11 @@ Module {
             name: "selectedSeriesChanged"
             Parameter { name: "series"; type: "QSurface3DSeries"; isPointer: true }
         }
+        Signal {
+            name: "flipHorizontalGridChanged"
+            revision: 1
+            Parameter { name: "flip"; type: "bool" }
+        }
         Method {
             name: "handleAxisXChanged"
             Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
@@ -560,8 +631,11 @@ Module {
     Component {
         name: "QtDataVisualization::Q3DCamera"
         prototype: "QtDataVisualization::Q3DObject"
-        exports: ["QtDataVisualization/Camera3D 1.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtDataVisualization/Camera3D 1.0",
+            "QtDataVisualization/Camera3D 1.2"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "CameraPreset"
             values: {
@@ -592,23 +666,26 @@ Module {
                 "CameraPresetDirectlyBelow": 23
             }
         }
-        Property { name: "xRotation"; type: "double" }
-        Property { name: "yRotation"; type: "double" }
-        Property { name: "zoomLevel"; type: "double" }
+        Property { name: "xRotation"; type: "float" }
+        Property { name: "yRotation"; type: "float" }
+        Property { name: "zoomLevel"; type: "float" }
         Property { name: "cameraPreset"; type: "CameraPreset" }
         Property { name: "wrapXRotation"; type: "bool" }
         Property { name: "wrapYRotation"; type: "bool" }
+        Property { name: "target"; revision: 1; type: "QVector3D" }
+        Property { name: "minZoomLevel"; revision: 1; type: "float" }
+        Property { name: "maxZoomLevel"; revision: 1; type: "float" }
         Signal {
             name: "xRotationChanged"
-            Parameter { name: "rotation"; type: "double" }
+            Parameter { name: "rotation"; type: "float" }
         }
         Signal {
             name: "yRotationChanged"
-            Parameter { name: "rotation"; type: "double" }
+            Parameter { name: "rotation"; type: "float" }
         }
         Signal {
             name: "zoomLevelChanged"
-            Parameter { name: "zoomLevel"; type: "double" }
+            Parameter { name: "zoomLevel"; type: "float" }
         }
         Signal {
             name: "cameraPresetChanged"
@@ -622,10 +699,47 @@ Module {
             name: "wrapYRotationChanged"
             Parameter { name: "isEnabled"; type: "bool" }
         }
+        Signal {
+            name: "targetChanged"
+            revision: 1
+            Parameter { name: "target"; type: "QVector3D" }
+        }
+        Signal {
+            name: "minZoomLevelChanged"
+            revision: 1
+            Parameter { name: "zoomLevel"; type: "float" }
+        }
+        Signal {
+            name: "maxZoomLevelChanged"
+            revision: 1
+            Parameter { name: "zoomLevel"; type: "float" }
+        }
     }
     Component {
         name: "QtDataVisualization::Q3DInputHandler"
         prototype: "QtDataVisualization::QAbstract3DInputHandler"
+        exports: ["QtDataVisualization/InputHandler3D 1.2"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "rotationEnabled"; type: "bool" }
+        Property { name: "zoomEnabled"; type: "bool" }
+        Property { name: "selectionEnabled"; type: "bool" }
+        Property { name: "zoomAtTargetEnabled"; type: "bool" }
+        Signal {
+            name: "rotationEnabledChanged"
+            Parameter { name: "enable"; type: "bool" }
+        }
+        Signal {
+            name: "zoomEnabledChanged"
+            Parameter { name: "enable"; type: "bool" }
+        }
+        Signal {
+            name: "selectionEnabledChanged"
+            Parameter { name: "enable"; type: "bool" }
+        }
+        Signal {
+            name: "zoomAtTargetEnabledChanged"
+            Parameter { name: "enable"; type: "bool" }
+        }
     }
     Component {
         name: "QtDataVisualization::Q3DLight"
@@ -654,7 +768,8 @@ Module {
         Property { name: "slicingActive"; type: "bool" }
         Property { name: "activeCamera"; type: "Q3DCamera"; isPointer: true }
         Property { name: "activeLight"; type: "Q3DLight"; isPointer: true }
-        Property { name: "devicePixelRatio"; type: "double" }
+        Property { name: "devicePixelRatio"; type: "float" }
+        Property { name: "graphPositionQuery"; revision: 1; type: "QPoint" }
         Signal {
             name: "viewportChanged"
             Parameter { name: "viewport"; type: "QRect" }
@@ -685,12 +800,17 @@ Module {
         }
         Signal {
             name: "devicePixelRatioChanged"
-            Parameter { name: "pixelRatio"; type: "double" }
+            Parameter { name: "pixelRatio"; type: "float" }
         }
         Signal {
             name: "selectionQueryPositionChanged"
             Parameter { name: "position"; type: "QPoint" }
         }
+        Signal {
+            name: "graphPositionQueryChanged"
+            revision: 1
+            Parameter { name: "position"; type: "QPoint" }
+        }
     }
     Component {
         name: "QtDataVisualization::Q3DTheme"
@@ -733,9 +853,9 @@ Module {
         Property { name: "baseGradients"; type: "QList<QLinearGradient>" }
         Property { name: "singleHighlightGradient"; type: "QLinearGradient" }
         Property { name: "multiHighlightGradient"; type: "QLinearGradient" }
-        Property { name: "lightStrength"; type: "double" }
-        Property { name: "ambientLightStrength"; type: "double" }
-        Property { name: "highlightLightStrength"; type: "double" }
+        Property { name: "lightStrength"; type: "float" }
+        Property { name: "ambientLightStrength"; type: "float" }
+        Property { name: "highlightLightStrength"; type: "float" }
         Property { name: "labelBorderEnabled"; type: "bool" }
         Property { name: "font"; type: "QFont" }
         Property { name: "backgroundEnabled"; type: "bool" }
@@ -796,15 +916,15 @@ Module {
         }
         Signal {
             name: "lightStrengthChanged"
-            Parameter { name: "strength"; type: "double" }
+            Parameter { name: "strength"; type: "float" }
         }
         Signal {
             name: "ambientLightStrengthChanged"
-            Parameter { name: "strength"; type: "double" }
+            Parameter { name: "strength"; type: "float" }
         }
         Signal {
             name: "highlightLightStrengthChanged"
-            Parameter { name: "strength"; type: "double" }
+            Parameter { name: "strength"; type: "float" }
         }
         Signal {
             name: "labelBorderEnabledChanged"
@@ -861,10 +981,10 @@ Module {
         Property { name: "labels"; type: "QStringList" }
         Property { name: "orientation"; type: "AxisOrientation"; isReadonly: true }
         Property { name: "type"; type: "AxisType"; isReadonly: true }
-        Property { name: "min"; type: "double" }
-        Property { name: "max"; type: "double" }
+        Property { name: "min"; type: "float" }
+        Property { name: "max"; type: "float" }
         Property { name: "autoAdjustRange"; type: "bool" }
-        Property { name: "labelAutoRotation"; revision: 1; type: "double" }
+        Property { name: "labelAutoRotation"; revision: 1; type: "float" }
         Property { name: "titleVisible"; revision: 1; type: "bool" }
         Property { name: "titleFixed"; revision: 1; type: "bool" }
         Signal {
@@ -877,16 +997,16 @@ Module {
         }
         Signal {
             name: "minChanged"
-            Parameter { name: "value"; type: "double" }
+            Parameter { name: "value"; type: "float" }
         }
         Signal {
             name: "maxChanged"
-            Parameter { name: "value"; type: "double" }
+            Parameter { name: "value"; type: "float" }
         }
         Signal {
             name: "rangeChanged"
-            Parameter { name: "min"; type: "double" }
-            Parameter { name: "max"; type: "double" }
+            Parameter { name: "min"; type: "float" }
+            Parameter { name: "max"; type: "float" }
         }
         Signal {
             name: "autoAdjustRangeChanged"
@@ -895,7 +1015,7 @@ Module {
         Signal {
             name: "labelAutoRotationChanged"
             revision: 1
-            Parameter { name: "angle"; type: "double" }
+            Parameter { name: "angle"; type: "float" }
         }
         Signal {
             name: "titleVisibilityChanged"
@@ -1059,7 +1179,7 @@ Module {
         Method {
             name: "setMeshAxisAndAngle"
             Parameter { name: "axis"; type: "QVector3D" }
-            Parameter { name: "angle"; type: "double" }
+            Parameter { name: "angle"; type: "float" }
         }
     }
     Component {
@@ -1087,7 +1207,7 @@ Module {
         exportMetaObjectRevisions: [0]
         Property { name: "dataProxy"; type: "QBarDataProxy"; isPointer: true }
         Property { name: "selectedBar"; type: "QPoint" }
-        Property { name: "meshAngle"; type: "double" }
+        Property { name: "meshAngle"; type: "float" }
         Signal {
             name: "dataProxyChanged"
             Parameter { name: "proxy"; type: "QBarDataProxy"; isPointer: true }
@@ -1098,7 +1218,7 @@ Module {
         }
         Signal {
             name: "meshAngleChanged"
-            Parameter { name: "angle"; type: "double" }
+            Parameter { name: "angle"; type: "float" }
         }
     }
     Component {
@@ -1156,8 +1276,11 @@ Module {
     Component {
         name: "QtDataVisualization::QCustom3DItem"
         prototype: "QObject"
-        exports: ["QtDataVisualization/Custom3DItem 1.1"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtDataVisualization/Custom3DItem 1.1",
+            "QtDataVisualization/Custom3DItem 1.2"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "meshFile"; type: "string" }
         Property { name: "textureFile"; type: "string" }
         Property { name: "position"; type: "QVector3D" }
@@ -1166,6 +1289,7 @@ Module {
         Property { name: "rotation"; type: "QQuaternion" }
         Property { name: "visible"; type: "bool" }
         Property { name: "shadowCasting"; type: "bool" }
+        Property { name: "scalingAbsolute"; revision: 1; type: "bool" }
         Signal {
             name: "meshFileChanged"
             Parameter { name: "meshFile"; type: "string" }
@@ -1198,10 +1322,15 @@ Module {
             name: "shadowCastingChanged"
             Parameter { name: "shadowCasting"; type: "bool" }
         }
+        Signal {
+            name: "scalingAbsoluteChanged"
+            revision: 1
+            Parameter { name: "scalingAbsolute"; type: "bool" }
+        }
         Method {
             name: "setRotationAxisAndAngle"
             Parameter { name: "axis"; type: "QVector3D" }
-            Parameter { name: "angle"; type: "double" }
+            Parameter { name: "angle"; type: "float" }
         }
     }
     Component {
@@ -1246,16 +1375,107 @@ Module {
         }
     }
     Component {
+        name: "QtDataVisualization::QCustom3DVolume"
+        prototype: "QtDataVisualization::QCustom3DItem"
+        exports: ["QtDataVisualization/Custom3DVolume 1.2"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "textureWidth"; type: "int" }
+        Property { name: "textureHeight"; type: "int" }
+        Property { name: "textureDepth"; type: "int" }
+        Property { name: "sliceIndexX"; type: "int" }
+        Property { name: "sliceIndexY"; type: "int" }
+        Property { name: "sliceIndexZ"; type: "int" }
+        Property { name: "colorTable"; type: "QVector<QRgb>" }
+        Property { name: "textureData"; type: "QVector<uchar>"; isPointer: true }
+        Property { name: "alphaMultiplier"; type: "float" }
+        Property { name: "preserveOpacity"; type: "bool" }
+        Property { name: "useHighDefShader"; type: "bool" }
+        Property { name: "drawSlices"; type: "bool" }
+        Property { name: "drawSliceFrames"; type: "bool" }
+        Property { name: "sliceFrameColor"; type: "QColor" }
+        Property { name: "sliceFrameWidths"; type: "QVector3D" }
+        Property { name: "sliceFrameGaps"; type: "QVector3D" }
+        Property { name: "sliceFrameThicknesses"; type: "QVector3D" }
+        Signal {
+            name: "textureWidthChanged"
+            Parameter { name: "value"; type: "int" }
+        }
+        Signal {
+            name: "textureHeightChanged"
+            Parameter { name: "value"; type: "int" }
+        }
+        Signal {
+            name: "textureDepthChanged"
+            Parameter { name: "value"; type: "int" }
+        }
+        Signal {
+            name: "sliceIndexXChanged"
+            Parameter { name: "value"; type: "int" }
+        }
+        Signal {
+            name: "sliceIndexYChanged"
+            Parameter { name: "value"; type: "int" }
+        }
+        Signal {
+            name: "sliceIndexZChanged"
+            Parameter { name: "value"; type: "int" }
+        }
+        Signal {
+            name: "textureDataChanged"
+            Parameter { name: "data"; type: "QVector<uchar>"; isPointer: true }
+        }
+        Signal {
+            name: "textureFormatChanged"
+            Parameter { name: "format"; type: "QImage::Format" }
+        }
+        Signal {
+            name: "alphaMultiplierChanged"
+            Parameter { name: "mult"; type: "float" }
+        }
+        Signal {
+            name: "preserveOpacityChanged"
+            Parameter { name: "enabled"; type: "bool" }
+        }
+        Signal {
+            name: "useHighDefShaderChanged"
+            Parameter { name: "enabled"; type: "bool" }
+        }
+        Signal {
+            name: "drawSlicesChanged"
+            Parameter { name: "enabled"; type: "bool" }
+        }
+        Signal {
+            name: "drawSliceFramesChanged"
+            Parameter { name: "enabled"; type: "bool" }
+        }
+        Signal {
+            name: "sliceFrameColorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "sliceFrameWidthsChanged"
+            Parameter { name: "values"; type: "QVector3D" }
+        }
+        Signal {
+            name: "sliceFrameGapsChanged"
+            Parameter { name: "values"; type: "QVector3D" }
+        }
+        Signal {
+            name: "sliceFrameThicknessesChanged"
+            Parameter { name: "values"; type: "QVector3D" }
+        }
+    }
+    Component {
         name: "QtDataVisualization::QHeightMapSurfaceDataProxy"
         prototype: "QtDataVisualization::QSurfaceDataProxy"
         exports: ["QtDataVisualization/HeightMapSurfaceDataProxy 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "heightMap"; type: "QImage" }
         Property { name: "heightMapFile"; type: "string" }
-        Property { name: "minXValue"; type: "double" }
-        Property { name: "maxXValue"; type: "double" }
-        Property { name: "minZValue"; type: "double" }
-        Property { name: "maxZValue"; type: "double" }
+        Property { name: "minXValue"; type: "float" }
+        Property { name: "maxXValue"; type: "float" }
+        Property { name: "minZValue"; type: "float" }
+        Property { name: "maxZValue"; type: "float" }
         Signal {
             name: "heightMapChanged"
             Parameter { name: "image"; type: "QImage" }
@@ -1266,19 +1486,19 @@ Module {
         }
         Signal {
             name: "minXValueChanged"
-            Parameter { name: "value"; type: "double" }
+            Parameter { name: "value"; type: "float" }
         }
         Signal {
             name: "maxXValueChanged"
-            Parameter { name: "value"; type: "double" }
+            Parameter { name: "value"; type: "float" }
         }
         Signal {
             name: "minZValueChanged"
-            Parameter { name: "value"; type: "double" }
+            Parameter { name: "value"; type: "float" }
         }
         Signal {
             name: "maxZValueChanged"
-            Parameter { name: "value"; type: "double" }
+            Parameter { name: "value"; type: "float" }
         }
     }
     Component {
@@ -1657,7 +1877,7 @@ Module {
         exportMetaObjectRevisions: [0]
         Property { name: "dataProxy"; type: "QScatterDataProxy"; isPointer: true }
         Property { name: "selectedItem"; type: "int" }
-        Property { name: "itemSize"; type: "double" }
+        Property { name: "itemSize"; type: "float" }
         Signal {
             name: "dataProxyChanged"
             Parameter { name: "proxy"; type: "QScatterDataProxy"; isPointer: true }
@@ -1668,7 +1888,7 @@ Module {
         }
         Signal {
             name: "itemSizeChanged"
-            Parameter { name: "size"; type: "double" }
+            Parameter { name: "size"; type: "float" }
         }
     }
     Component {
@@ -1736,6 +1956,8 @@ Module {
         Property { name: "flatShadingEnabled"; type: "bool" }
         Property { name: "flatShadingSupported"; type: "bool"; isReadonly: true }
         Property { name: "drawMode"; type: "DrawFlags" }
+        Property { name: "texture"; type: "QImage" }
+        Property { name: "textureFile"; type: "string" }
         Signal {
             name: "dataProxyChanged"
             Parameter { name: "proxy"; type: "QSurfaceDataProxy"; isPointer: true }
@@ -1756,6 +1978,14 @@ Module {
             name: "drawModeChanged"
             Parameter { name: "mode"; type: "QSurface3DSeries::DrawFlags" }
         }
+        Signal {
+            name: "textureChanged"
+            Parameter { name: "image"; type: "QImage" }
+        }
+        Signal {
+            name: "textureFileChanged"
+            Parameter { name: "filename"; type: "string" }
+        }
     }
     Component {
         name: "QtDataVisualization::QSurfaceDataProxy"
@@ -1808,6 +2038,8 @@ Module {
     Component {
         name: "QtDataVisualization::QTouch3DInputHandler"
         prototype: "QtDataVisualization::Q3DInputHandler"
+        exports: ["QtDataVisualization/TouchInputHandler3D 1.2"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QtDataVisualization::QValue3DAxis"