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

Fix duplicate exports in plugins.qmltypes 

Between 1.0 and 1.1 version of charts, two qml types changed names,
but were still backed up by the same C++ type. To avoid duplicate
entries for same C++ type in plugins.qmltypes, we just provide two
exports for the same C++ type. This will unify the version numbers
for the combined types as well, but this shouldn't be a problem.

Fixes: QTBUG-115358
Pick-to: 6.9 6.8
Change-Id: I5f8d91fd4902f9f29b589d9f7abb08071105829b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Miikka Heikkinen 2025-04-01 14:47:35 +03:00
parent c0a5fb552e
commit f1a0abc19f
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/chartsqml2/declarativeforeigntypes_p.h
View File

@ -96,21 +96,13 @@ struct CppQVBarModelMapper
QML_EXTRA_VERSION(2, 0)
};
struct BarCategoriesAxis
{
Q_GADGET
QML_FOREIGN(QBarCategoryAxis)
QML_ELEMENT
QML_ADDED_IN_VERSION(1, 0)
QML_EXTRA_VERSION(2, 0)
};
struct CppQBarCategoryAxis
{
Q_GADGET
QML_FOREIGN(QBarCategoryAxis)
QML_NAMED_ELEMENT(BarCategoryAxis)
QML_ADDED_IN_VERSION(1, 1)
QML_NAMED_ELEMENT(BarCategoriesAxis)
QML_ADDED_IN_VERSION(1, 0)
QML_EXTRA_VERSION(2, 0)
};
@ -290,24 +282,16 @@ struct CppQAbstractAxis
QML_UNCREATABLE("Uncreatable base type")
};
struct ValuesAxis
struct CppQValueAxis
{
Q_GADGET
QML_FOREIGN(QValueAxis)
QML_ELEMENT
QML_NAMED_ELEMENT(ValueAxis)
QML_NAMED_ELEMENT(ValuesAxis)
QML_ADDED_IN_VERSION(1, 0)
QML_EXTRA_VERSION(2, 0)
};
struct ValueAxis
{
Q_GADGET
QML_FOREIGN(QValueAxis)
QML_ELEMENT
QML_ADDED_IN_VERSION(1, 1)
QML_EXTRA_VERSION(2, 0)
};
struct CppQLogValueAxis
{
Q_GADGET