Thu, 20 May 2010 20:13:15 +0200
Merged pull with local changes.
--- a/Utilities/Startup.py Thu May 20 17:50:45 2010 +0200 +++ b/Utilities/Startup.py Thu May 20 20:13:15 2010 +0200 @@ -201,6 +201,16 @@ handleArgs(argv, appinfo) app = E5Application(argv) app.setQuitOnLastWindowClosed(quitOnLastWindowClosed) + + if Utilities.isWindowsPlatform(): + libPath = os.path.join(Utilities.getPythonModulesDirectory(), + "PyQt", "plugins") + if os.path.exists(libPath): + libPath = Utilities.fromNativeSeparators(libPath) + libraryPaths = QApplication.libraryPaths() + if libPath not in libraryPaths: + libraryPaths.insert(0, libPath) + QApplication.setLibraryPaths(libraryPaths) initializeResourceSearchPath() QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
--- a/eric5.py Thu May 20 17:50:45 2010 +0200 +++ b/eric5.py Thu May 20 20:13:15 2010 +0200 @@ -176,6 +176,16 @@ app = E5Application(sys.argv) + if Utilities.isWindowsPlatform(): + libPath = os.path.join(Utilities.getPythonModulesDirectory(), + "PyQt", "plugins") + if os.path.exists(libPath): + libPath = Utilities.fromNativeSeparators(libPath) + libraryPaths = QApplication.libraryPaths() + if libPath not in libraryPaths: + libraryPaths.insert(0, libPath) + QApplication.setLibraryPaths(libraryPaths) + # set the searchpath for icons Startup.initializeResourceSearchPath()