qiurui
/
qtdatavis3d
mirror of https://github.com/qt/qtdatavis3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wip/qt6' into dev 

Conflicts:
	.qmake.conf

Change-Id: Ic4b3c490262e4a72bdd45b03828b88a784a4b9b8
This commit is contained in:
Simon Hausmann 2019-10-04 14:30:34 +02:00
parent 339b94c95c c4c7a35ea5
commit a87ef47a47
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.qmake.conf
View File

@ -2,6 +2,6 @@ load(qt_build_config)
DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
MODULE_VERSION = 5.15.0 MODULE_VERSION = 6.0.0
CONFIG += warning_clean CONFIG += warning_clean
CMAKE_MODULE_TESTS=- CMAKE_MODULE_TESTS=-

4
src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
View File

@ -144,7 +144,9 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri)
// New revisions // New revisions
qmlRegisterType<Q3DLight, 1>(uri, 1, 3, "Light3D"); 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 QT_END_NAMESPACE_DATAVISUALIZATION