Skip to content

Add more signals to cxx_qt_lib #1217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2025
Merged

Add more signals to cxx_qt_lib #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion crates/cxx-qt-gen/src/generator/rust/signals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ pub fn generate_rust_signal(
if !signal.private {
cxx_mod_contents.push(parse_quote_spanned! {
span=>
#(#cfgs)*
#unsafety_block extern "C++" {
#[cxx_name = #cpp_ident]
#(#cfgs)*
#(#doc_comments)*
#namespace
#unsafe_call fn #signal_ident_cpp(#parameter_signatures) #return_type;
Expand All @@ -155,6 +155,7 @@ pub fn generate_rust_signal(
parse_quote_spanned! {
span=>
#[namespace = #namespace_str]
#(#cfgs)*
extern "Rust" {
#[doc(hidden)]
fn #signal_handler_drop(handler: #signal_handler_alias);
Expand Down
24 changes: 16 additions & 8 deletions crates/cxx-qt-gen/test_outputs/cfgs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ mod ffi {
#[cfg(enabled)]
fn inherit_enabled(self: &QObjectEnabled);
}
#[cfg(not(enabled))]
unsafe extern "C++" {
#[cxx_name = "signal_disabled"]
#[cfg(not(enabled))]
fn signal_disabled(self: Pin<&mut QObjectEnabled>);
}
#[cfg(not(enabled))]
Expand All @@ -113,6 +113,7 @@ mod ffi {
) -> CxxQtQMetaObjectConnection;
}
#[namespace = "rust::cxxqtgen1"]
#[cfg(not(enabled))]
extern "Rust" {
#[doc(hidden)]
fn drop_QObjectEnabled_signal_handler_signal_disabled(
Expand All @@ -124,9 +125,9 @@ mod ffi {
self_value: Pin<&mut QObjectEnabled>,
);
}
#[cfg(enabled)]
unsafe extern "C++" {
#[cxx_name = "signal_enabled"]
#[cfg(enabled)]
fn signal_enabled(self: Pin<&mut QObjectEnabled>);
}
#[cfg(enabled)]
Expand All @@ -147,6 +148,7 @@ mod ffi {
) -> CxxQtQMetaObjectConnection;
}
#[namespace = "rust::cxxqtgen1"]
#[cfg(enabled)]
extern "Rust" {
#[doc(hidden)]
fn drop_QObjectEnabled_signal_handler_signal_enabled(
Expand Down Expand Up @@ -230,9 +232,9 @@ mod ffi {
#[cfg(enabled)]
fn inherit_enabled(self: &QObjectDisabled);
}
#[cfg(not(enabled))]
unsafe extern "C++" {
#[cxx_name = "signal_disabled"]
#[cfg(not(enabled))]
fn signal_disabled(self: Pin<&mut QObjectDisabled>);
}
#[cfg(not(enabled))]
Expand All @@ -253,6 +255,7 @@ mod ffi {
) -> CxxQtQMetaObjectConnection;
}
#[namespace = "rust::cxxqtgen1"]
#[cfg(not(enabled))]
extern "Rust" {
#[doc(hidden)]
fn drop_QObjectDisabled_signal_handler_signal_disabled(
Expand All @@ -264,9 +267,9 @@ mod ffi {
self_value: Pin<&mut QObjectDisabled>,
);
}
#[cfg(enabled)]
unsafe extern "C++" {
#[cxx_name = "signal_enabled"]
#[cfg(enabled)]
fn signal_enabled(self: Pin<&mut QObjectDisabled>);
}
#[cfg(enabled)]
Expand All @@ -287,6 +290,7 @@ mod ffi {
) -> CxxQtQMetaObjectConnection;
}
#[namespace = "rust::cxxqtgen1"]
#[cfg(enabled)]
extern "Rust" {
#[doc(hidden)]
fn drop_QObjectDisabled_signal_handler_signal_enabled(
Expand Down Expand Up @@ -352,9 +356,9 @@ mod ffi {
#[cfg(enabled)]
type QObjectExternEnabled;
}
#[cfg(not(enabled))]
unsafe extern "C++" {
#[cxx_name = "signal_disabled1"]
#[cfg(not(enabled))]
fn signal_disabled1(self: Pin<&mut QObjectExternEnabled>);
}
#[cfg(not(enabled))]
Expand All @@ -375,6 +379,7 @@ mod ffi {
) -> CxxQtQMetaObjectConnection;
}
#[namespace = "rust::cxxqtgen1"]
#[cfg(not(enabled))]
extern "Rust" {
#[doc(hidden)]
fn drop_QObjectExternEnabled_signal_handler_signal_disabled1(
Expand All @@ -386,9 +391,9 @@ mod ffi {
self_value: Pin<&mut QObjectExternEnabled>,
);
}
#[cfg(enabled)]
unsafe extern "C++" {
#[cxx_name = "signal_enabled1"]
#[cfg(enabled)]
fn signal_enabled1(self: Pin<&mut QObjectExternEnabled>);
}
#[cfg(enabled)]
Expand All @@ -409,6 +414,7 @@ mod ffi {
) -> CxxQtQMetaObjectConnection;
}
#[namespace = "rust::cxxqtgen1"]
#[cfg(enabled)]
extern "Rust" {
#[doc(hidden)]
fn drop_QObjectExternEnabled_signal_handler_signal_enabled1(
Expand Down Expand Up @@ -438,9 +444,9 @@ mod ffi {
#[cfg(not(enabled))]
type QObjectExternDisabled;
}
#[cfg(not(enabled))]
unsafe extern "C++" {
#[cxx_name = "signal_disabled2"]
#[cfg(not(enabled))]
fn signal_disabled2(self: Pin<&mut QObjectExternDisabled>);
}
#[cfg(not(enabled))]
Expand All @@ -461,6 +467,7 @@ mod ffi {
) -> CxxQtQMetaObjectConnection;
}
#[namespace = "rust::cxxqtgen1"]
#[cfg(not(enabled))]
extern "Rust" {
#[doc(hidden)]
fn drop_QObjectExternDisabled_signal_handler_signal_disabled2(
Expand All @@ -472,9 +479,9 @@ mod ffi {
self_value: Pin<&mut QObjectExternDisabled>,
);
}
#[cfg(enabled)]
unsafe extern "C++" {
#[cxx_name = "signal_enabled2"]
#[cfg(enabled)]
fn signal_enabled2(self: Pin<&mut QObjectExternDisabled>);
}
#[cfg(enabled)]
Expand All @@ -495,6 +502,7 @@ mod ffi {
) -> CxxQtQMetaObjectConnection;
}
#[namespace = "rust::cxxqtgen1"]
#[cfg(enabled)]
extern "Rust" {
#[doc(hidden)]
fn drop_QObjectExternDisabled_signal_handler_signal_enabled2(
Expand Down
5 changes: 5 additions & 0 deletions crates/cxx-qt-lib/src/qml/qqmlapplicationengine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ mod ffi {
qobject: *mut QObject,
url: &QUrl,
);

#[qsignal]
#[rust_name = "object_creation_failed"]
#[cfg(any(cxxqt_qt_version_at_least_7, cxxqt_qt_version_at_least_6_4))]
fn objectCreationFailed(self: Pin<&mut QQmlApplicationEngine>, url: &QUrl);
}

unsafe extern "C++" {
Expand Down
Loading