Mercurial Repositories > eric / file comparison
comparison: eric6/Globals/__init__.py
eric6/Globals/__init__.py
- branch
- maintenance
- changeset 8043
- 0acf98cd089a
- parent 7924
- 8a96736d465e
- parent 7923
- 91e843545d9a
- child 8142
- 43248bafe9b2
equal
deleted
inserted
replaced
| 7991:866adc8c315b | 8043:0acf98cd089a |
|---|---|
| 280 import Preferences | 280 import Preferences |
| 281 | 281 |
| 282 path = "" | 282 path = "" |
| 283 | 283 |
| 284 # step 1: check, if the user has configured a tools path | 284 # step 1: check, if the user has configured a tools path |
| 285 path = Preferences.getQt("PyQtToolsDir") | 285 if version == 5: |
| 286 | 286 path = Preferences.getQt("PyQtToolsDir") |
| 287 # step 2: determine from used Python interpreter (pyrcc is test object) | 287 elif version == 6: |
| 288 path = Preferences.getQt("PyQt6ToolsDir") | |
| 289 | |
| 290 # step 2: determine from used Python interpreter (pylupdate is test object) | |
| 288 if not path: | 291 if not path: |
| 289 program = "pyrcc{0}".format(version) | 292 program = "pylupdate{0}".format(version) |
| 290 if isWindowsPlatform(): | 293 if isWindowsPlatform(): |
| 291 program += ".exe" | 294 program += ".exe" |
| 292 dirName = os.path.dirname(sys.executable) | 295 dirName = os.path.dirname(sys.executable) |
| 293 if os.path.exists(os.path.join(dirName, program)): | 296 if os.path.exists(os.path.join(dirName, program)): |
| 294 path = dirName | 297 path = dirName |
