diff -r c87eb20797b7 -r 15eca21fd968 eric7/Preferences/__init__.py
--- a/eric7/Preferences/__init__.py Sat Aug 28 19:48:56 2021 +0200
+++ b/eric7/Preferences/__init__.py Sat Aug 28 19:57:35 2021 +0200
@@ -1183,7 +1183,7 @@
# defaults for Qt related stuff
qtDefaults = {
- "Qt5TranslationsDir": "",
+ "Qt6TranslationsDir": "",
"QtToolsDir": "",
"QtToolsPrefix": "",
"QtToolsPostfix": "",
@@ -2170,7 +2170,7 @@
else:
return QColor(col)
else:
- # palette based defaults here because of Qt5
+ # palette based defaults here because of Qt6
if key == "EditAreaForeground":
return QApplication.palette().color(QPalette.ColorGroup.Active,
QPalette.ColorRole.Base)
@@ -2653,12 +2653,12 @@
def getQtDocDir(version, prefClass=Prefs):
"""
- Module function to retrieve the Qt5DocDir setting.
+ Module function to retrieve the Qt5DocDir/Qt6DocDir setting.
@param version Qt version to get documentation directory for
@type int
@param prefClass preferences class used as the storage area
- @return the requested Qt5DocDir setting
+ @return the requested Qt5DocDir/Qt6DocDir setting
@rtype str
"""
key = "Qt{0}DocDir".format(version)
@@ -2938,15 +2938,15 @@
def getQtTranslationsDir(prefClass=Prefs):
"""
- Module function to retrieve the Qt5TranslationsDir
+ Module function to retrieve the Qt6TranslationsDir
setting depending on the current Qt version.
@param prefClass preferences class used as the storage area
@return the requested setting (string)
"""
s = prefClass.settings.value(
- "Qt/Qt5TranslationsDir",
- prefClass.qtDefaults["Qt5TranslationsDir"])
+ "Qt/Qt6TranslationsDir",
+ prefClass.qtDefaults["Qt6TranslationsDir"])
if s == "":
s = QLibraryInfo.path(
QLibraryInfo.LibraryPath.TranslationsPath)
@@ -2966,7 +2966,7 @@
@param prefClass preferences class used as the storage area
@return the requested Qt setting
"""
- if key in ["Qt5TranslationsDir"]:
+ if key in ["Qt6TranslationsDir"]:
return getQtTranslationsDir(prefClass)
elif key in ["PyuicIndent", "Pyuic6Indent"]:
return int(prefClass.settings.value(
