Skip to content

Commit bf73f64

Browse files
committed
cxx-qt-build: remove unused link_qt_external feature
1 parent ea40247 commit bf73f64

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

crates/cxx-qt-build/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ codespan-reporting = "0.11"
2727
default = ["qt_gui", "qt_qml"]
2828
qt_gui = ["cxx-qt-lib-headers/qt_gui"]
2929
qt_qml = ["cxx-qt-lib-headers/qt_qml"]
30-
link_qt_external = []
3130
link_qt_object_files = ["qt-build-utils/link_qt_object_files"]

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -400,13 +400,7 @@ impl CxxQtBuilder {
400400

401401
let mut qtbuild = qt_build_utils::QtBuild::new(self.qt_modules.into_iter().collect())
402402
.expect("Could not find Qt installation");
403-
// some external build systems will include object files found by cargo_link_libraries and
404-
// are hard to remove. instead instruct this function to not include these object files.
405-
if cfg!(feature = "link_qt_external") {
406-
qtbuild.cargo_link_libraries(None);
407-
} else {
408-
qtbuild.cargo_link_libraries(Some(&mut self.cc_builder));
409-
}
403+
qtbuild.cargo_link_libraries(Some(&mut self.cc_builder));
410404

411405
// Write cxx-qt-lib and cxx headers
412406
cxx_qt_lib_headers::write_headers(format!("{header_root}/cxx-qt-lib"));

0 commit comments

Comments
 (0)