diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml index 16a7f55bc..0656d5480 100644 --- a/installer/installbuilder/swift-externals.xml +++ b/installer/installbuilder/swift-externals.xml @@ -42,6 +42,17 @@ + + bin + ${installdir}/bin + bin_linux + linux linux-x64 + + + ../../dist/bin/swift_crashpad_handler + + + bin ${installdir}/bin diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index d3c2857e5..c75ec013e 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -118,11 +118,8 @@ else:unix { source_path = $$EXTERNALS_BIN_DIR/* dest_path = $$DestRoot/bin } -# Currently there is no bin folder in linux externals -win32|macx { - !isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += && - QMAKE_POST_LINK += $$copy_command $$shell_path($$source_path) $$shell_path($$dest_path) -} +!isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += && +QMAKE_POST_LINK += $$copy_command $$shell_path($$source_path) $$shell_path($$dest_path) win32 { copy_command = xcopy /Y