Anthony Tuininga avatar Anthony Tuininga committed 9f0a8c5 Merge

Merged in takluyver/cx_freeze/macqt-syntaxfix (pull request #7)

Comments (0)

Files changed (1)

cx_Freeze/macdist.py

                             filepath))
 
     def find_qt_menu_nib(self):
-        """Returns a list of locations to try for a qt_menu.nib folder, or None
-        if this is not a Qt application.
+        """Returns a location of a qt_menu.nib folder, or None if this is not a Qt application.
         """
         if self.qt_menu_nib:
-            return [self.qt_menu_nib]
-        elif any(n.startswith("PyQt4.QtCore" for n in os.listdir(self.binDir)):
+            return self.qt_menu_nib
+        elif any(n.startswith("PyQt4.QtCore") for n in os.listdir(self.binDir)):
             from PyQt4 import QtCore
-        elif any(n.startswith("PySide.QtCore" for n in os.listdir(self.binDir)):
+        elif any(n.startswith("PySide.QtCore") for n in os.listdir(self.binDir)):
             from PyQt4 import QtCore
         else:
             return None
             
         libpath = QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.LibrariesPath)
-        return [os.path.join(libpath, 'QtGui.framework/Resources/qt_menu.nib'),
-                os.path.join(libpath, 'Resources/qt_menu.nib'),
-               ]
+        for subpath in ['QtGui.framework/Resources/qt_menu.nib', 'Resources/qt_menu.nib']:
+            path = os.path.join(libpath, subpath)
+            if os.path.exists(path):
+                return path
+        
+        raise IOError("Could not find qt_menu.nib")
             
     def prepare_qt_app(self):
         """Add resource files for a Qt application. Should do nothing if the
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.