8614:4a3a68e51b92 | 8615:d43e7eb22319 |
---|---|
224 qtDataDir = os.path.join(pyqtDataDir, "Qt") | 224 qtDataDir = os.path.join(pyqtDataDir, "Qt") |
225 else: | 225 else: |
226 # determine dynamically | 226 # determine dynamically |
227 try: | 227 try: |
228 from PyQt6.QtCore import QLibraryInfo | 228 from PyQt6.QtCore import QLibraryInfo |
229 qtDataDir = QLibraryInfo.path(QLibraryInfo.DataPath) | 229 qtDataDir = QLibraryInfo.path(QLibraryInfo.LibraryPath.DataPath) |
230 except ImportError: | 230 except ImportError: |
231 qtDataDir = None | 231 qtDataDir = None |
232 apisDir = os.path.join(qtDataDir, "qsci", "api") if qtDataDir else None | 232 apisDir = os.path.join(qtDataDir, "qsci", "api") if qtDataDir else None |
233 | 233 |
234 | 234 |
1096 | 1096 |
1097 # determine entry for DYLD_FRAMEWORK_PATH | 1097 # determine entry for DYLD_FRAMEWORK_PATH |
1098 dyldLine = "" | 1098 dyldLine = "" |
1099 try: | 1099 try: |
1100 from PyQt6.QtCore import QLibraryInfo | 1100 from PyQt6.QtCore import QLibraryInfo |
1101 qtLibraryDir = QLibraryInfo.path(QLibraryInfo.LibrariesPath) | 1101 qtLibraryDir = QLibraryInfo.path( |
1102 QLibraryInfo.LibraryPath.LibrariesPath) | |
1102 except ImportError: | 1103 except ImportError: |
1103 qtLibraryDir = "" | 1104 qtLibraryDir = "" |
1104 if qtLibraryDir: | 1105 if qtLibraryDir: |
1105 dyldLine = "DYLD_FRAMEWORK_PATH={0}\n".format(qtLibraryDir) | 1106 dyldLine = "DYLD_FRAMEWORK_PATH={0}\n".format(qtLibraryDir) |
1106 | 1107 |