Skip to content

Commit d0bab9c

Browse files
committed
cxx-qt-build: remove unused link_qt_external feature
1 parent 3c78079 commit d0bab9c

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

crates/cxx-qt-build/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,4 @@ version_check = "0.9"
2828
default = ["qt_gui", "qt_qml"]
2929
qt_gui = ["cxx-qt-lib-headers/qt_gui"]
3030
qt_qml = ["cxx-qt-lib-headers/qt_qml"]
31-
link_qt_external = []
3231
link_qt_object_files = ["qt-build-utils/link_qt_object_files"]

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,7 @@ impl CxxQtBuilder {
399399

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

410404
// Write cxx-qt-gen, cxx-qt-lib and cxx headers
411405
cxx_qt_gen::write_headers(format!("{header_root}/cxx-qt-common"));

0 commit comments

Comments
 (0)