cxx-qt-lib: implement QVariantValue for QVector2D/3D/4D (#1309)

Author: jnbooth

crates/cxx-qt-lib/build.rs

@@ -201,6 +201,9 @@ fn main() {
         rust_bridges.extend([
             "core/qlist/qlist_qcolor",
             "core/qvariant/qvariant_qcolor",
+            "core/qvariant/qvariant_qvector2d",
+            "core/qvariant/qvariant_qvector3d",
+            "core/qvariant/qvariant_qvector4d",
             "core/qvector/qvector_qcolor",
             "gui/qcolor",
             "gui/qfont",

crates/cxx-qt-lib/include/core/qvariant.h

@@ -33,6 +33,9 @@
 
 #ifdef CXX_QT_GUI_FEATURE
 #include <QtGui/QColor>
+#include <QtGui/QVector2D>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
 #endif
 
 #include "rust/cxx.h"
@@ -80,6 +83,9 @@ CXX_QT_QVARIANT_CAN_CONVERT(I64)
 CXX_QT_QVARIANT_CAN_CONVERT(QByteArray)
 #ifdef CXX_QT_GUI_FEATURE
 CXX_QT_QVARIANT_CAN_CONVERT(QColor)
+CXX_QT_QVARIANT_CAN_CONVERT(QVector2D)
+CXX_QT_QVARIANT_CAN_CONVERT(QVector3D)
+CXX_QT_QVARIANT_CAN_CONVERT(QVector4D)
 #endif
 CXX_QT_QVARIANT_CAN_CONVERT(QDate)
 CXX_QT_QVARIANT_CAN_CONVERT(QDateTime)

crates/cxx-qt-lib/src/core/qvariant/generate.sh

@@ -117,6 +117,9 @@ generate_bridge_qt "QStringList" "qstringlist"
 generate_bridge_qt "QTime" "qtime"
 generate_bridge_qt "QUrl" "qurl"
 generate_bridge_qt "QUuid" "quuid"
+generate_bridge_qt "QVector2D" "qvector2d"
+generate_bridge_qt "QVector3D" "qvector3d"
+generate_bridge_qt "QVector4D" "qvector4d"
 generate_bridge_primitive "u8" "U8"
 generate_bridge_primitive "u16" "U16"
 generate_bridge_primitive "u32" "U32"

crates/cxx-qt-lib/src/core/qvariant/mod.rs

@@ -213,6 +213,12 @@ impl_qvariant_value!(crate::QStringList, qvariant_qstringlist);
 impl_qvariant_value!(crate::QTime, qvariant_qtime);
 impl_qvariant_value!(crate::QUrl, qvariant_qurl);
 impl_qvariant_value!(crate::QUuid, qvariant_quuid);
+#[cfg(feature = "qt_gui")]
+impl_qvariant_value!(crate::QVector2D, qvariant_qvector2d);
+#[cfg(feature = "qt_gui")]
+impl_qvariant_value!(crate::QVector3D, qvariant_qvector3d);
+#[cfg(feature = "qt_gui")]
+impl_qvariant_value!(crate::QVector4D, qvariant_qvector4d);
 impl_qvariant_value!(u8, qvariant_u8);
 impl_qvariant_value!(u16, qvariant_u16);
 impl_qvariant_value!(u32, qvariant_u32);

crates/cxx-qt-lib/src/core/qvariant/qvariant.cpp

@@ -68,6 +68,9 @@ CXX_QT_QVARIANT_CAN_CONVERT_IMPL(::std::int64_t, I64)
 CXX_QT_QVARIANT_CAN_CONVERT_IMPL(::QByteArray, QByteArray)
 #ifdef CXX_QT_GUI_FEATURE
 CXX_QT_QVARIANT_CAN_CONVERT_IMPL(::QColor, QColor)
+CXX_QT_QVARIANT_CAN_CONVERT_IMPL(::QVector2D, QVector2D)
+CXX_QT_QVARIANT_CAN_CONVERT_IMPL(::QVector3D, QVector3D)
+CXX_QT_QVARIANT_CAN_CONVERT_IMPL(::QVector4D, QVector4D)
 #endif
 CXX_QT_QVARIANT_CAN_CONVERT_IMPL(::QDate, QDate)
 CXX_QT_QVARIANT_CAN_CONVERT_IMPL(::QDateTime, QDateTime)