9 files changed, 15 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 8b807e2b..a8f1baef 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,5 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.12.3
+MODULE_VERSION = 5.13.0
 CONFIG += warning_clean
 CMAKE_MODULE_TESTS=-
diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
index fdb9b5b0..44049bf3 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
+++ b/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:
diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc
index db9ca24e..5ee8cd87 100644
--- a/src/datavisualization/doc/src/qtdatavisualization.qdoc
+++ b/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
 
diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp
index 1c5913d1..06f6d9eb 100644
--- a/src/datavisualization/engine/axisrendercache.cpp
+++ b/src/datavisualization/engine/axisrendercache.cpp
@@ -201,7 +201,7 @@ int AxisRenderCache::maxLabelWidth(const QStringList &labels) const
     labelFont.setPointSize(textureFontSize);
     QFontMetrics labelFM(labelFont);
     for (int i = 0; i < labels.size(); i++) {
-        int newWidth = labelFM.width(labels.at(i));
+        int newWidth = labelFM.horizontalAdvance(labels.at(i));
         if (labelWidth < newWidth)
             labelWidth = newWidth;
     }
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index f80cf45f..d5850d86 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -84,7 +84,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo
     QFont valueFont = font;
     valueFont.setPointSize(textureFontSize);
     QFontMetrics valueFM(valueFont);
-    int valueStrWidth = valueFM.width(text);
+    int valueStrWidth = valueFM.horizontalAdvance(text);
 
     // ES2 needs to use maxLabelWidth always (when given) because of the power of 2 -issue.
     if (maxLabelWidth && (labelBackground || Utils::isOpenGLES()))
@@ -136,7 +136,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo
             if (maxLabelWidth && (labelBackground || Utils::isOpenGLES()))
                 valueStrWidth = maxLabelWidth * fontRatio;
             else
-                valueStrWidth = currentValueFM.width(text);
+                valueStrWidth = currentValueFM.horizontalAdvance(text);
             valueStrHeight = currentValueFM.height();
             valueStrWidth += paddingWidth / 2;
         }
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro
index 41e5ffad..4c378c3b 100644
--- a/src/datavisualizationqml2/datavisualizationqml2.pro
+++ b/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)
 
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 2e1ae083..28c3666e 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/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
diff --git a/src/datavisualizationqml2/plugins.qmltypes b/src/datavisualizationqml2/plugins.qmltypes
index 24eaa92d..b4b91a81 100644
--- a/src/datavisualizationqml2/plugins.qmltypes
+++ b/src/datavisualizationqml2/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -defaultplatform QtDataVisualization 1.3'
+// 'qmlplugindump -nonrelocatable -defaultplatform QtDataVisualization 1.13'
 
 Module {
-    dependencies: ["QtQuick 2.12"]
+    dependencies: ["QtQuick 2.0"]
     Component {
         name: "QtDataVisualization::AbstractDeclarative"
         defaultProperty: "data"
diff --git a/tests/manual/volumetrictest/volumetrictest.cpp b/tests/manual/volumetrictest/volumetrictest.cpp
index 09dae433..6b2a57a8 100644
--- a/tests/manual/volumetrictest/volumetrictest.cpp
+++ b/tests/manual/volumetrictest/volumetrictest.cpp
@@ -381,7 +381,7 @@ void VolumetricModifier::createVolume()
     logo.load(QStringLiteral(":/logo_no_padding.png"));
     //logo.load(QStringLiteral(":/logo.png"));
     qDebug() << "image dimensions:" << logo.width() << logo.height()
-             << logo.byteCount() << (logo.width() * logo.height())
+             << logo.sizeInBytes() << (logo.width() * logo.height())
              << logo.bytesPerLine();
 
     QVector<QImage *> imageArray(imageCount);
@@ -535,7 +535,7 @@ void VolumetricModifier::createAnotherVolume()
     //logo.load(QStringLiteral(":/logo.png"));
     logo = logo.convertToFormat(QImage::Format_ARGB8555_Premultiplied);
     qDebug() << "second image dimensions:" << logo.width() << logo.height()
-             << logo.byteCount() << (logo.width() * logo.height())
+             << logo.sizeInBytes() << (logo.width() * logo.height())
              << logo.bytesPerLine();
 
     logo.save("d:/qt/goobar.png");