diff -r ebab8ba287e6 -r 6b42677d7043 eric6/Preferences/ConfigurationDialog.py
--- a/eric6/Preferences/ConfigurationDialog.py Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/Preferences/ConfigurationDialog.py Mon Sep 02 18:50:38 2019 +0200
@@ -12,8 +12,7 @@
import os
import types
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, PYQT_VERSION, Qt, QMetaObject, \
- QRect
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QMetaObject, QRect
from PyQt5.QtGui import QPixmap
from PyQt5.QtWidgets import QSizePolicy, QSpacerItem, QWidget, QTreeWidget, \
QStackedWidget, QDialog, QSplitter, QScrollArea, QApplication, \
@@ -24,7 +23,7 @@
from E5Gui import E5MessageBox
from E5Gui.E5MainWindow import E5MainWindow
-from Globals import isMacPlatform, qVersionTuple, getWebBrowserSupport
+from Globals import isMacPlatform, getWebBrowserSupport
import Preferences
@@ -366,15 +365,12 @@
"webBrowserVirusTotalPage":
[self.tr("VirusTotal Interface"), "virustotal.png",
"WebBrowserVirusTotalPage", "0webBrowserPage", None],
+ "webBrowserSpellCheckingPage":
+ [self.tr("Spell checking"),
+ "preferences-spellchecking.png",
+ "WebBrowserSpellCheckingPage", "0webBrowserPage",
+ None],
})
- if qVersionTuple() >= (5, 8, 0) and PYQT_VERSION >= 0x50800:
- self.configItems.update({
- "webBrowserSpellCheckingPage":
- [self.tr("Spell checking"),
- "preferences-spellchecking.png",
- "WebBrowserSpellCheckingPage", "0webBrowserPage",
- None],
- })
self.configItems.update(
e5App().getObject("PluginManager").getPluginConfigData())
@@ -419,15 +415,12 @@
"webBrowserVirusTotalPage":
[self.tr("VirusTotal Interface"), "virustotal.png",
"WebBrowserVirusTotalPage", None, None],
+
+ "webBrowserSpellCheckingPage":
+ [self.tr("Spell checking"),
+ "preferences-spellchecking.png",
+ "WebBrowserSpellCheckingPage", None, None],
}
-
- if qVersionTuple() >= (5, 8, 0) and PYQT_VERSION >= 0x50800:
- self.configItems.update({
- "webBrowserSpellCheckingPage":
- [self.tr("Spell checking"),
- "preferences-spellchecking.png",
- "WebBrowserSpellCheckingPage", None, None],
- })
elif displayMode == ConfigurationWidget.TrayStarterMode:
self.configItems = {
