6 files changed, 9 insertions, 36 deletions
diff --git a/src/charts/doc/snippets/doc_src_qmlcharts.cpp b/src/charts/doc/snippets/doc_src_qmlcharts.cpp
deleted file mode 100644
index 8d3b8822..00000000
--- a/src/charts/doc/snippets/doc_src_qmlcharts.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Charts module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-import QtCharts 2.3
-//! [0]
diff --git a/src/charts/doc/src/index.qdoc b/src/charts/doc/src/index.qdoc
index 5674f541..92f75ea7 100644
--- a/src/charts/doc/src/index.qdoc
+++ b/src/charts/doc/src/index.qdoc
@@ -38,7 +38,9 @@
 
     To import Qt Charts QML types, add the following import statement to your \c .qml file:
 
-    \snippet doc_src_qmlcharts.cpp 0
+    \qml \QtMinorVersion
+    import QtCharts 2.\1
+    \endqml
 
     If you intend to use Qt Charts C++ classes in your application, use the
     following include and using directives:
diff --git a/src/charts/doc/src/qtcharts.qdoc b/src/charts/doc/src/qtcharts.qdoc
index 4758de69..9c70c58c 100644
--- a/src/charts/doc/src/qtcharts.qdoc
+++ b/src/charts/doc/src/qtcharts.qdoc
@@ -59,7 +59,7 @@
 */
 
 /*!
-    \qmlmodule QtCharts 2.3
+    \qmlmodule QtCharts 2.\QtMinorVersion
     \title Qt Charts QML Types
     \ingroup qmlmodules
 
diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro
index 562e02b8..e7a2a4c5 100644
--- a/src/chartsqml2/chartsqml2.pro
+++ b/src/chartsqml2/chartsqml2.pro
@@ -56,7 +56,7 @@ contains(QT_CONFIG, opengl) {
 HEADERS += $$PRIVATE_HEADERS
 INCLUDEPATH += $$PWD
 
-IMPORT_VERSION = 2.3
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 QMAKE_QMLPLUGINDUMP_FLAGS = -qapp
 
 load(qml_plugin)
diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp
index 3720a0a8..e50ab84c 100644
--- a/src/chartsqml2/chartsqml2_plugin.cpp
+++ b/src/chartsqml2/chartsqml2_plugin.cpp
@@ -346,6 +346,9 @@ public:
 
         // QtCharts 2.3
         qmlRegisterType<QValueAxis, 1>(uri, 2, 3, "ValueAxis");
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions
+        qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
     }
 
 };
diff --git a/src/chartsqml2/plugins.qmltypes b/src/chartsqml2/plugins.qmltypes
index 139c191a..ca8f5163 100644
--- a/src/chartsqml2/plugins.qmltypes
+++ b/src/chartsqml2/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -qapp QtCharts 2.3'
+// 'qmlplugindump -nonrelocatable -qapp QtCharts 2.13'
 
 Module {
     dependencies: ["QtQuick 2.0"]