diff --git a/src/chartsqml2/declarativeforeigntypes_p.h b/src/chartsqml2/declarativeforeigntypes_p.h index 60d50ec5..380421dc 100644 --- a/src/chartsqml2/declarativeforeigntypes_p.h +++ b/src/chartsqml2/declarativeforeigntypes_p.h @@ -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