diff -r 0af028b93cb3 -r 7991ea245c20 eric6/Project/Project.py
--- a/eric6/Project/Project.py Mon Dec 21 13:36:24 2020 +0100
+++ b/eric6/Project/Project.py Tue Dec 22 19:59:29 2020 +0100
@@ -265,19 +265,22 @@
self.__projectTypes = {
"PyQt5": self.tr("PyQt5 GUI"),
"PyQt5C": self.tr("PyQt5 Console"),
+ "PyQt6": self.tr("PyQt6 GUI"),
+ "PyQt6C": self.tr("PyQt6 Console"),
"E6Plugin": self.tr("Eric6 Plugin"),
"Console": self.tr("Console"),
"Other": self.tr("Other"),
}
self.__projectProgLanguages = {
- "Python3": ["PyQt5", "PyQt5C", "E6Plugin", "Console", "Other"],
+ "Python3": ["PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin",
+ "Console", "Other"],
"MicroPython": ["Console", "Other"],
"Ruby": ["Console", "Other"],
"JavaScript": ["Other"],
}
- if Utilities.checkPyside():
+ if Utilities.checkPyside(variant=2):
self.__projectTypes["PySide2"] = self.tr("PySide2 GUI")
self.__projectTypes["PySide2C"] = self.tr("PySide2 Console")
self.__projectProgLanguages["Python3"].extend(
@@ -589,6 +592,7 @@
# Forms
if self.pdata["PROJECTTYPE"] in ["E6Plugin",
"PyQt5",
+ "PyQt6",
"PySide2"]:
self.pdata["FILETYPES"]["*.ui"] = "FORMS"
@@ -601,6 +605,7 @@
# Translations
if self.pdata["PROJECTTYPE"] in ["E6Plugin",
"PyQt5", "PyQt5C",
+ "PyQt6", "PyQt6C",
"PySide2", "PySide2C"]:
self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
self.pdata["FILETYPES"]["*.qm"] = "TRANSLATIONS"
@@ -623,6 +628,7 @@
"""
if self.pdata["PROJECTTYPE"] in ["E6Plugin",
"PyQt5", "PyQt5C",
+ "PyQt6", "PyQt6C",
"PySide2", "PySide2C"]:
if "*.ts" not in self.pdata["FILETYPES"]:
self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
@@ -1378,7 +1384,8 @@
if dlg.exec() == QDialog.Accepted:
lang = dlg.getSelectedLanguage()
if self.pdata["PROJECTTYPE"] in [
- "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
+ "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin",
+ "PySide2", "PySide2C"
]:
langFile = self.pdata["TRANSLATIONPATTERN"].replace(
"%language%", lang)
