[tor-commits] [torbrowser/master] update contents and location of qt.conf so that it works as intended in osx tbb

[erinn at torproject.org]

commit 394ba79fd9d7b2a54744a45d88960c550b92b9aa
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Feb 12 17:09:44 2012 +0100

    update contents and location of qt.conf so that it works as intended in osx tbb
---
 build-scripts/config/qt.conf |    2 +-
 build-scripts/osx.mk         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-scripts/config/qt.conf b/build-scripts/config/qt.conf
index ecb499a..64d7297 100644
--- a/build-scripts/config/qt.conf
+++ b/build-scripts/config/qt.conf
@@ -1,2 +1,2 @@
 [Paths]
-Plugins =
+Plugins = PlugIns
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 6fbcc03..6607367 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -291,7 +291,7 @@ configure-apps:
 	cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
 	cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents
 	cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents
-	cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/Resources
+	cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources
 	cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources
 
 	## Configure Vidalia