From 88ea5f78552f96b4a0b9c16a2f03bb065783c749 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 12 Jun 2012 00:47:27 +0200 Subject: [PATCH] * Fixed macdeploy scripts for VLC2 and Qt 4.8.2. --- admin/mac/macdeploy.py | 6 +++--- admin/mac/qt.conf | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index f6ab64641..bf859e346 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -206,7 +206,7 @@ TOMAHAWK_PLUGINS = [ ] QT_PLUGINS_SEARCH_PATH=[ - '/usr/local/Cellar/qt/4.7.4/plugins', + '/usr/local/Cellar/qt/4.8.2/plugins', ] @@ -249,7 +249,7 @@ frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks') commands.append(['mkdir', '-p', frameworks_dir]) resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources') commands.append(['mkdir', '-p', resources_dir]) -plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns') +plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins') binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name) fixed_libraries = [] @@ -489,7 +489,7 @@ def FindVLCPlugin(name): FixBinary(binary) for plugin in VLC_PLUGINS: - FixVLCPlugin(FindVLCPlugin(plugin), '../Frameworks/vlc/plugins') + FixVLCPlugin(FindVLCPlugin(plugin), '../plugins') for plugin in TOMAHAWK_PLUGINS: FixPlugin(plugin, '../MacOS') diff --git a/admin/mac/qt.conf b/admin/mac/qt.conf index 64d729736..d0e7835ac 100644 --- a/admin/mac/qt.conf +++ b/admin/mac/qt.conf @@ -1,2 +1,2 @@ [Paths] -Plugins = PlugIns +Plugins = qt-plugins