diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-03-13 11:50:07 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-03-14 05:31:08 +0000 |
| commit | 5c2043f77c31bb02a5ce7c2e0fbb8d040f395d3c (patch) | |
| tree | e08afdf438a73fc1f9d5dd3829894d29e1cff9ee /src | |
| parent | d0ece82c68825a25a55ecaa148bd36f161e351e1 (diff) | |
Fix QML import version
Task-number: QTBUG-74032
Change-Id: I1fca2212a2013fe18388e5e1e20e75847ee6be8b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
4 files changed, 7 insertions, 3 deletions
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/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 |