Skip to content

Commit 9309a94

Browse files
committed
cxx-qt-lib: remove old QMetaObjectConnection and re-export
1 parent 5d1d996 commit 9309a94

File tree

6 files changed

+2
-144
lines changed

6 files changed

+2
-144
lines changed

crates/cxx-qt-lib-headers/include/core/qmetaobjectconnection.h

-35
This file was deleted.

crates/cxx-qt-lib-headers/src/lib.rs

-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ pub fn build_opts() -> cxx_qt_build::CxxQtBuildersOpts {
3333
(include_str!("../include/core/qmap.h"), "qmap.h"),
3434
(include_str!("../include/core/qmargins.h"), "qmargins.h"),
3535
(include_str!("../include/core/qmarginsf.h"), "qmarginsf.h"),
36-
(
37-
include_str!("../include/core/qmetaobjectconnection.h"),
38-
"qmetaobjectconnection.h",
39-
),
4036
(
4137
include_str!("../include/core/qmodelindex.h"),
4238
"qmodelindex.h",

crates/cxx-qt-lib/build.rs

-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ fn main() {
7474
"core/qmap/qmap_qstring_qvariant",
7575
"core/qmargins",
7676
"core/qmarginsf",
77-
"core/qmetaobjectconnection",
7877
"core/qmodelindex",
7978
"core/qpersistentmodelindex",
8079
"core/qpoint",
@@ -209,7 +208,6 @@ fn main() {
209208
"core/qmap/qmap",
210209
"core/qmargins",
211210
"core/qmarginsf",
212-
"core/qmetaobjectconnection",
213211
"core/qmodelindex",
214212
"core/qpersistentmodelindex",
215213
"core/qpoint",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ pub use qmargins::QMargins;
3838
mod qmarginsf;
3939
pub use qmarginsf::QMarginsF;
4040

41-
mod qmetaobjectconnection;
42-
pub use qmetaobjectconnection::QMetaObjectConnection;
41+
// Reexport QMetaObject connection from cxx-qt
42+
pub use cxx_qt::QMetaObjectConnection;
4343

4444
mod qmetaobjectconnectionguard;
4545
pub use qmetaobjectconnectionguard::QMetaObjectConnectionGuard;

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

-32
This file was deleted.

crates/cxx-qt-lib/src/core/qmetaobjectconnection.rs

-69
This file was deleted.

0 commit comments

Comments
 (0)