diff -r a1471981ef18 -r 856628e8a303 src/eric7/UI/UserInterface.py --- a/src/eric7/UI/UserInterface.py Sun Apr 13 14:46:18 2025 +0200 +++ b/src/eric7/UI/UserInterface.py Sun Apr 13 15:53:14 2025 +0200 @@ -3648,27 +3648,6 @@ """ Private slot to initialize the action to show the Qt documentation. """ - self.qt5DocAct = EricAction( - self.tr("Qt5 Documentation"), - self.tr("Qt5 Documentation"), - 0, - 0, - self, - "qt5_documentation", - ) - self.qt5DocAct.setStatusTip(self.tr("Open Qt5 Documentation")) - self.qt5DocAct.setWhatsThis( - self.tr( - """<b>Qt5 Documentation</b>""" - """<p>Display the Qt5 Documentation. Dependent upon your""" - """ settings, this will either show the help in Eric's internal""" - """ help viewer/web browser, or execute a web browser or Qt""" - """ Assistant. </p>""" - ) - ) - self.qt5DocAct.triggered.connect(lambda: self.__showQtDoc(5)) - self.actions.append(self.qt5DocAct) - self.qt6DocAct = EricAction( self.tr("Qt6 Documentation"), self.tr("Qt6 Documentation"), @@ -3690,27 +3669,6 @@ self.qt6DocAct.triggered.connect(lambda: self.__showQtDoc(6)) self.actions.append(self.qt6DocAct) - self.pyqt5DocAct = EricAction( - self.tr("PyQt5 Documentation"), - self.tr("PyQt5 Documentation"), - 0, - 0, - self, - "pyqt5_documentation", - ) - self.pyqt5DocAct.setStatusTip(self.tr("Open PyQt5 Documentation")) - self.pyqt5DocAct.setWhatsThis( - self.tr( - """<b>PyQt5 Documentation</b>""" - """<p>Display the PyQt5 Documentation. Dependent upon your""" - """ settings, this will either show the help in Eric's""" - """ internal help viewer/web browser, or execute a web""" - """ browser or Qt Assistant. </p>""" - ) - ) - self.pyqt5DocAct.triggered.connect(lambda: self.__showPyQtDoc(variant=5)) - self.actions.append(self.pyqt5DocAct) - self.pyqt6DocAct = EricAction( self.tr("PyQt6 Documentation"), self.tr("PyQt6 Documentation"), @@ -4114,9 +4072,7 @@ self.__menus["help"].addSeparator() self.__menus["help"].addAction(self.ericDocAct) self.__menus["help"].addAction(self.pythonDocAct) - self.__menus["help"].addAction(self.qt5DocAct) self.__menus["help"].addAction(self.qt6DocAct) - self.__menus["help"].addAction(self.pyqt5DocAct) self.__menus["help"].addAction(self.pyqt6DocAct) if self.pyside6DocAct is not None: self.__menus["help"].addAction(self.pyside6DocAct) @@ -6927,11 +6883,11 @@ else: self.__customViewer(home) - def __showPyQtDoc(self, variant=5): - """ - Private slot to show the PyQt5/6 documentation. - - @param variant PyQt variant to show documentation for (5 or 6) + def __showPyQtDoc(self, variant=6): + """ + Private slot to show the PyQt documentation. + + @param variant PyQt variant to show documentation for @type int or str """ pyqtDocDir = Preferences.getHelp("PyQt{0}DocDir".format(variant)) @@ -8683,7 +8639,7 @@ def getOriginalPathString(self): """ Public method to get the original PATH environment variable - (i.e. before modifications by eric and PyQt5). + (i.e. before modifications by eric). @return original PATH environment variable @rtype str