From 2e88a7f6c934fb53659d7ed61ba648a126bcb792 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 14 Jul 2014 11:56:59 +0200 Subject: Fix deployment of clang code model plugin. Broke with the removal of the QtProject subdir for plugins Change-Id: Ic42d3e9b902f7ac228e62923093dfe6af01b2d19 Reviewed-by: Nikolai Kosjar --- scripts/deployqtHelper_mac.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index ababf8a7de..28e3d26c23 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -61,9 +61,9 @@ if [ $LLVM_INSTALL_DIR ]; then cp -f "$LLVM_INSTALL_DIR"/lib/libclang.dylib "$1/Contents/PlugIns/" || exit 1 cp -Rf "$LLVM_INSTALL_DIR"/lib/clang "$1/Contents/Resources/cplusplus/" || exit 1 fi - _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/QtProject/libClangCodeModel_debug.dylib" + _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel_debug.dylib" if [ ! -f "$_CLANG_CODEMODEL_LIB" ]; then - _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/QtProject/libClangCodeModel.dylib" + _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel.dylib" fi xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path/.." "$_CLANG_CODEMODEL_LIB" || true fi -- cgit v1.2.1