File tree 2 files changed +1
-8
lines changed
2 files changed +1
-8
lines changed Original file line number Diff line number Diff line change @@ -27,5 +27,4 @@ codespan-reporting = "0.11"
27
27
default = [" qt_gui" , " qt_qml" ]
28
28
qt_gui = [" cxx-qt-lib-headers/qt_gui" ]
29
29
qt_qml = [" cxx-qt-lib-headers/qt_qml" ]
30
- link_qt_external = []
31
30
link_qt_object_files = [" qt-build-utils/link_qt_object_files" ]
Original file line number Diff line number Diff line change @@ -400,13 +400,7 @@ impl CxxQtBuilder {
400
400
401
401
let mut qtbuild = qt_build_utils:: QtBuild :: new ( self . qt_modules . into_iter ( ) . collect ( ) )
402
402
. 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 ) ) ;
410
404
411
405
// Write cxx-qt-lib and cxx headers
412
406
cxx_qt_lib_headers:: write_headers ( format ! ( "{header_root}/cxx-qt-lib" ) ) ;
You can’t perform that action at this time.
0 commit comments