Mercurial Repositories > eric / file comparison
comparison: eric5.py
eric5.py
- branch
- 5_3_x
- changeset 2611
- dd77cc80e343
- parent 2302
- f29e9405c851
- child 2668
- 4c5320acf00d
equal
deleted
inserted
replaced
| 2604:3f785deb97eb | 2611:dd77cc80e343 |
|---|---|
| 205 splash = NoneSplashScreen() | 205 splash = NoneSplashScreen() |
| 206 else: | 206 else: |
| 207 splash = SplashScreen() | 207 splash = SplashScreen() |
| 208 | 208 |
| 209 # modify the executable search path for the PyQt4 installer | 209 # modify the executable search path for the PyQt4 installer |
| 210 try: | 210 if Globals.isWindowsPlatform(): |
| 211 from PyQt4 import pyqtconfig | 211 pyqtDataDir = os.path.join(Globals.getPythonModulesDirectory(), "PyQt4") |
| 212 pyqtDataDir = pyqtconfig._pkg_config["pyqt_mod_dir"] | |
| 213 if os.path.exists(os.path.join(pyqtDataDir, "bin")): | 212 if os.path.exists(os.path.join(pyqtDataDir, "bin")): |
| 214 path = os.path.join(pyqtDataDir, "bin") + os.pathsep + os.environ["PATH"] | 213 path = os.path.join(pyqtDataDir, "bin") + os.pathsep + os.environ["PATH"] |
| 215 else: | 214 else: |
| 216 path = pyqtDataDir + os.pathsep + os.environ["PATH"] | 215 path = pyqtDataDir + os.pathsep + os.environ["PATH"] |
| 217 os.environ["PATH"] = path | 216 os.environ["PATH"] = path |
| 218 except (AttributeError, ImportError): | |
| 219 pass | |
| 220 | 217 |
| 221 pluginFile = None | 218 pluginFile = None |
| 222 noopen = False | 219 noopen = False |
| 223 if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex: | 220 if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex: |
| 224 del sys.argv[sys.argv.index("--noopen")] | 221 del sys.argv[sys.argv.index("--noopen")] |
