Mercurial Repositories > eric / file comparison
comparison: src/eric7/eric7_diff.py
src/eric7/eric7_diff.py
- branch
- eric7
- changeset 9482
- a2bc06a54d9d
- parent 9473
- 3f23dbf37dbe
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9481:0b936ff1bbb9 | 9482:a2bc06a54d9d |
|---|---|
| 12 version of the integrated Diff module. | 12 version of the integrated Diff module. |
| 13 """ | 13 """ |
| 14 | 14 |
| 15 import os | 15 import os |
| 16 import sys | 16 import sys |
| 17 | |
| 18 from PyQt6.QtGui import QGuiApplication | |
| 17 | 19 |
| 18 for arg in sys.argv[:]: | 20 for arg in sys.argv[:]: |
| 19 if arg.startswith("--config="): | 21 if arg.startswith("--config="): |
| 20 from eric7 import Globals | 22 from eric7 import Globals |
| 21 | 23 |
| 51 | 53 |
| 52 def main(): | 54 def main(): |
| 53 """ | 55 """ |
| 54 Main entry point into the application. | 56 Main entry point into the application. |
| 55 """ | 57 """ |
| 56 from PyQt6.QtGui import QGuiApplication | |
| 57 | |
| 58 QGuiApplication.setDesktopFileName("eric7_diff.desktop") | 58 QGuiApplication.setDesktopFileName("eric7_diff.desktop") |
| 59 | 59 |
| 60 options = [ | 60 options = [ |
| 61 ( | 61 ( |
| 62 "--config=configDir", | 62 "--config=configDir", |
