diff options
author | Eike Ziller <eike.ziller@digia.com> | 2014-07-14 11:56:59 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-07-15 08:21:55 +0200 |
commit | 2e88a7f6c934fb53659d7ed61ba648a126bcb792 (patch) | |
tree | 31f8a01ecc3d620e3f620f958b019dba6b2bfb30 | |
parent | 076896d4f3976936fc77fe174428982d1e0ff8bf (diff) | |
download | qt-creator-2e88a7f6c934fb53659d7ed61ba648a126bcb792.tar.gz |
Fix deployment of clang code model plugin.
Broke with the removal of the QtProject subdir for plugins
Change-Id: Ic42d3e9b902f7ac228e62923093dfe6af01b2d19
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
-rwxr-xr-x | scripts/deployqtHelper_mac.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |