diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:30:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:30:34 +0200 |
| commit | a87ef47a479ee358bef183a6c4ad2d59030855d3 (patch) | |
| tree | 0a470fe572b9e2a488f9d7a19ce669f409d47627 /src | |
| parent | 339b94c95c60c9a6344aa2fe5a49c1ef8e7b61d1 (diff) | |
| parent | c4c7a35ea5d8faee7e315d26a2251ac02ffef103 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: Ic4b3c490262e4a72bdd45b03828b88a784a4b9b8
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2_plugin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index 28c3666e..5b515a04 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -144,7 +144,9 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) // New revisions qmlRegisterType<Q3DLight, 1>(uri, 1, 3, "Light3D"); - qmlRegisterModule(uri, 1, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 1, 15); } QT_END_NAMESPACE_DATAVISUALIZATION |