diff --git a/scripts/deployqt.py b/scripts/deployqt.py index f02f41652fa..8ef5917a30c 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -238,7 +238,7 @@ def deploy_clang(install_dir, llvm_install_dir, chrpath_bin): clanglibdirtarget = os.path.join(install_dir, 'bin', 'clang', 'lib') if not os.path.exists(clanglibdirtarget): os.makedirs(clanglibdirtarget) - for binary in ['clangd', 'clang-tidy', 'clazy-standalone']: + for binary in ['clangd', 'clang-tidy', 'clazy-standalone', 'clang-format']: binary_filepath = os.path.join(llvm_install_dir, 'bin', binary + '.exe') if os.path.exists(binary_filepath): deployinfo.append((binary_filepath, clangbindirtarget)) @@ -248,7 +248,7 @@ def deploy_clang(install_dir, llvm_install_dir, chrpath_bin): clangbinary_targetdir = os.path.join(install_dir, 'libexec', 'qtcreator', 'clang', 'bin') if not os.path.exists(clangbinary_targetdir): os.makedirs(clangbinary_targetdir) - for binary in ['clangd', 'clang-tidy', 'clazy-standalone']: + for binary in ['clangd', 'clang-tidy', 'clazy-standalone', 'clang-format']: binary_filepath = os.path.join(llvm_install_dir, 'bin', binary) if os.path.exists(binary_filepath): deployinfo.append((binary_filepath, clangbinary_targetdir)) diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 487cdfda656..21da15c74e0 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -123,6 +123,8 @@ if [ $LLVM_INSTALL_DIR ]; then cp -Rf "$clangdsource" "$libexec_path/clang/bin/" || exit 1 clangtidysource="$LLVM_INSTALL_DIR"/bin/clang-tidy cp -Rf "$clangtidysource" "$libexec_path/clang/bin/" || exit 1 + clangformatsource="$LLVM_INSTALL_DIR"/bin/clang-format + cp -Rf "$clangformatsource" "$libexec_path/clang/bin/" || exit 1 clazysource="$LLVM_INSTALL_DIR"/bin/clazy-standalone cp -Rf "$clazysource" "$libexec_path/clang/bin/" || exit 1 install_name_tool -add_rpath "@executable_path/../lib" "$libexec_path/clang/bin/clazy-standalone" 2> /dev/null