225 |
225 |
226 def main(): |
226 def main(): |
227 """ |
227 """ |
228 Main entry point into the application. |
228 Main entry point into the application. |
229 """ |
229 """ |
230 from eric7 import Globals |
|
231 from eric7.Globals import AppInfo |
230 from eric7.Globals import AppInfo |
|
231 from eric7.SystemUtilities import OSUtilities, QtUtilities |
232 from eric7.Toolbox import Startup |
232 from eric7.Toolbox import Startup |
233 |
233 |
234 global app, args, mainWindow, splash, restartArgs, inMainLoop |
234 global app, args, mainWindow, splash, restartArgs, inMainLoop |
235 |
235 |
236 sys.excepthook = excepthook |
236 sys.excepthook = excepthook |
324 else: |
324 else: |
325 splash = SplashScreen() |
325 splash = SplashScreen() |
326 QCoreApplication.processEvents() |
326 QCoreApplication.processEvents() |
327 |
327 |
328 # modify the executable search path for the PyQt5 installer |
328 # modify the executable search path for the PyQt5 installer |
329 if Globals.isWindowsPlatform(): |
329 if OSUtilities.isWindowsPlatform(): |
330 pyqtDataDir = Globals.getPyQt6ModulesDirectory() |
330 pyqtDataDir = QtUtilities.getPyQt6ModulesDirectory() |
331 if os.path.exists(os.path.join(pyqtDataDir, "bin")): |
331 if os.path.exists(os.path.join(pyqtDataDir, "bin")): |
332 path = os.path.join(pyqtDataDir, "bin") |
332 path = os.path.join(pyqtDataDir, "bin") |
333 else: |
333 else: |
334 path = pyqtDataDir |
334 path = pyqtDataDir |
335 os.environ["PATH"] = path + os.pathsep + os.environ["PATH"] |
335 os.environ["PATH"] = path + os.pathsep + os.environ["PATH"] |