diff -r cc296ba99a3f -r 6f958d5765f4 Preferences/ConfigurationDialog.py --- a/Preferences/ConfigurationDialog.py Wed Nov 01 19:22:02 2017 +0100 +++ b/Preferences/ConfigurationDialog.py Fri Nov 03 12:10:16 2017 +0100 @@ -12,7 +12,7 @@ import os import types -from PyQt5.QtCore import QMetaObject, pyqtSignal, Qt, QRect, pyqtSlot +from PyQt5.QtCore import pyqtSignal, pyqtSlot, PYQT_VERSION, Qt, QMetaObject, QRect from PyQt5.QtGui import QPixmap from PyQt5.QtWidgets import QSizePolicy, QSpacerItem, QWidget, QTreeWidget, \ QStackedWidget, QDialog, QSplitter, QScrollArea, QApplication, \ @@ -237,6 +237,9 @@ "editorCalltipsQScintillaPage": [self.tr("QScintilla"), "qscintilla.png", "EditorCalltipsQScintillaPage", "editorCalltipsPage", None], + "editorDocViewerPage": + [self.tr("Documentation Viewer"), "codeDocuViewer.png", + "EditorDocViewerPage", "0editorPage", None], "editorGeneralPage": [self.tr("General"), "preferences-general.png", "EditorGeneralPage", "0editorPage", None], @@ -343,7 +346,7 @@ [self.tr("VirusTotal Interface"), "virustotal.png", "HelpVirusTotalPage", "0webBrowserPage", None], }) - if qVersionTuple() >= (5, 8, 0): + if qVersionTuple() >= (5, 8, 0) and PYQT_VERSION >= 0x50800: self.configItems.update({ "webBrowserSpellCheckingPage": [self.tr("Spell checking"), @@ -467,7 +470,7 @@ "HelpVirusTotalPage", None, None], } - if qVersionTuple() >= (5, 8, 0): + if qVersionTuple() >= (5, 8, 0) and PYQT_VERSION >= 0x50800: self.configItems.update({ "webBrowserSpellCheckingPage": [self.tr("Spell checking"),