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 @@ -28,5 +28,4 @@ version_check = "0.9"
28
28
default = [" qt_gui" , " qt_qml" ]
29
29
qt_gui = [" cxx-qt-lib-headers/qt_gui" ]
30
30
qt_qml = [" cxx-qt-lib-headers/qt_qml" ]
31
- link_qt_external = []
32
31
link_qt_object_files = [" qt-build-utils/link_qt_object_files" ]
Original file line number Diff line number Diff line change @@ -399,13 +399,7 @@ impl CxxQtBuilder {
399
399
400
400
let mut qtbuild = qt_build_utils:: QtBuild :: new ( self . qt_modules . into_iter ( ) . collect ( ) )
401
401
. 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 ) ) ;
409
403
410
404
// Write cxx-qt-gen, cxx-qt-lib and cxx headers
411
405
cxx_qt_gen:: write_headers ( format ! ( "{header_root}/cxx-qt-common" ) ) ;
You can’t perform that action at this time.
0 commit comments