Skip to content

Commit

Permalink
Add missing QMetaType declaration for a couple of builtins types
Browse files Browse the repository at this point in the history
  • Loading branch information
ogoffart committed Feb 16, 2019
1 parent bd84eb6 commit ec11955
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions qmetaobject/src/qmetatype.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,8 @@ qdeclare_builtin_metatype!{f32 => 38}
qdeclare_builtin_metatype!{QVariantList => 9}
qdeclare_builtin_metatype!{QString => 10}
qdeclare_builtin_metatype!{QByteArray => 12}
qdeclare_builtin_metatype!{QRectF => 20}
qdeclare_builtin_metatype!{QPointF => 26}
//qdeclare_builtin_metatype!{QVariant => 41}
impl QMetaType for QVariant {
fn register(_name: Option<&std::ffi::CStr>) -> i32 {
Expand All @@ -257,6 +259,8 @@ impl QMetaType for QVariant {
}
}
qdeclare_builtin_metatype!{QModelIndex => 42}
qdeclare_builtin_metatype!{QColor => 67}
qdeclare_builtin_metatype!{QImage => 70}

#[cfg(target_pointer_width = "32")]
qdeclare_builtin_metatype!{isize => 32} // That's QMetaType::Long
Expand Down
2 changes: 2 additions & 0 deletions qmetaobject/tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ struct MyObject {
}),

method_out_of_line: qt_method!(fn(&self, a: QString) -> QString),

prop_color: qt_property!(QColor)
}

impl MyObject {
Expand Down

0 comments on commit ec11955

Please sign in to comment.