Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I73831adaf7bcbc59c55302af39cf510fffd0e8b6

dist/changes-5.12.2

@@ -0,0 +1,20 @@
+Qt 5.12.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.

src/datavisualization/doc/src/qtdatavisualization-index.qdoc

@@ -45,7 +45,9 @@
     To import Qt Data Visualization QML types, add the following import statement to your \c .qml
     file:
 
-    \snippet doc_src_qmldatavisualization.cpp 0
+    \qml \QtMinorVersion
+    import QtDataVisualization 1.\1
+    \endqml
 
     If you intend to use Qt Data Visualization C++ classes in your application, use the
     following include and using directives:

src/datavisualization/doc/src/qtdatavisualization.qdoc

@@ -45,7 +45,7 @@
 */
 
 /*!
-    \qmlmodule QtDataVisualization 1.2
+    \qmlmodule QtDataVisualization 1.\QtMinorVersion
     \title Qt Data Visualization QML Types
     \ingroup qmlmodules
 

src/datavisualizationqml2/datavisualizationqml2.pro

@@ -45,7 +45,7 @@ HEADERS += \
     glstatestore_p.h \
     enumtostringmap_p.h
 
-IMPORT_VERSION = 1.3
+IMPORT_VERSION = 1.$$QT_MINOR_VERSION
 QMAKE_QMLPLUGINDUMP_FLAGS += -defaultplatform
 load(qml_plugin)
 

src/datavisualizationqml2/datavisualizationqml2_plugin.cpp

@@ -143,6 +143,8 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri)
 
     // New revisions
     qmlRegisterType<Q3DLight, 1>(uri, 1, 3, "Light3D");
+
+    qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
 }
 
 QT_END_NAMESPACE_DATAVISUALIZATION