update osxdist for qt4.2.1

diff --git a/makelib/osxdist.py b/makelib/osxdist.py
index 37fe3b6e3e660bc13b7305e758759fb532b99bc2..b6b6134ae52de814d2b4d97b4b2f6d4bf526d120 100644 (file)
--- a/makelib/osxdist.py
+++ b/makelib/osxdist.py
@@ -116,8 +116,8 @@ def prelinkqt(app_name, bundle_dir, qt_lib_dir):
   OS X's treatment of dynamic loading is annoying
   properly prelink all the annoying qt components.
   """
-  framework_subpath = os.path.join("%(framework)s.framework", "Versions", "4.0", "%(framework)s")
-  frameworks = ['QtCore', 'QtGui', 'QtOpenGL', 'QtNetwork']
+  framework_subpath = os.path.join("%(framework)s.framework", "Versions", "4", "%(framework)s")
+  frameworks = ['QtCore', 'QtGui', 'QtOpenGL', 'QtAssistantClient', 'QtNetwork']
 
   qt_framework=os.path.join(qt_lib_dir, framework_subpath)
   app_binary=bundle_dir+"/Contents/MacOS/"+app_name
@@ -170,7 +170,7 @@ def validate_bundle(bundle_path):
   return valid
   
 def main(args):
-  qtroot = "/usr/local/qt/4.1.4"
+  qtroot = "/usr/local/qt/4.2.1"
   app_name = None
   build_num = None
   bundle_dir = None