diff -r a22eee00b052 -r ab0a91b82b37 eric6/UI/UserInterface.py
--- a/eric6/UI/UserInterface.py Sat Aug 31 12:58:11 2019 +0200
+++ b/eric6/UI/UserInterface.py Sun Sep 01 17:43:03 2019 +0200
@@ -2035,8 +2035,6 @@
))
self.helpviewerAct.triggered.connect(self.__helpViewer)
self.actions.append(self.helpviewerAct)
-## else:
-## self.helpviewerAct = None
self.__initQtDocActions()
self.__initPythonDocActions()
@@ -3680,12 +3678,6 @@
.format(chromeVersion)
except ImportError:
pass
- try:
- from PyQt5.QtWebKit import qWebKitVersion
- versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\
- .format(qWebKitVersion())
- except ImportError:
- pass
versionText += """<tr><td><b>{0}</b></td><td>{1}</td></tr>"""\
.format(Program, Version)
versionText += self.tr("""</table>""")
@@ -5979,9 +5971,6 @@
os.path.join(
os.path.dirname(__file__), "..", "eric6_browser.py"),
# QtWebEngine based web browser
- os.path.join(
- os.path.dirname(__file__), "..", "eric6_webbrowser.py"),
- # QtWebKit based web browser
]
process = QProcess()
for browser in webBrowsers:
@@ -6244,11 +6233,6 @@
PasswordManager
pwManager = PasswordManager()
pwManager.masterPasswordChanged(oldPassword, newPassword)
- elif variant == "QtWebKit":
- from Helpviewer.Passwords.PasswordManager import \
- PasswordManager
- pwManager = PasswordManager()
- pwManager.masterPasswordChanged(oldPassword, newPassword)
Utilities.crypto.changeRememberedMaster(newPassword)
def __reloadAPIs(self):
