Mercurial Repositories > eric / file diff

--- a/eric7/WebBrowser/QtHelp/HelpDocsInstaller.py	Mon Sep 13 19:35:19 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/HelpDocsInstaller.py	Tue Sep 14 18:05:47 2021 +0200
@@ -69,27 +69,29 @@
         engine = QHelpEngineCore(self.__collection)
         changes = False
         
-        # TODO: adapt to Qt6 once PyQt 6.2 is available
         qt5Docs = [
             "activeqt", "qdoc", "qmake", "qt3d", "qt3drenderer",
             "qtandroidextras", "qtassistant", "qtbluetooth", "qtcanvas3d",
-            "qtcharts", "qtconcurrent", "qtcore", "qtdatavisualization",
-            "qtdbus", "qtdesigner", "qtdistancefieldgenerator", "qtdoc",
-            "qtenginio", "qtenginiooverview", "qtenginoqml", "qtgamepad",
+            "qtcharts", "qtcmake", "qtconcurrent", "qtcore", "qtdatavis3d",
+            "qtdatavisualization", "qtdbus", "qtdesigner",
+            "qtdistancefieldgenerator", "qtdoc", "qtenginio",
+            "qtenginiooverview", "qtenginoqml", "qtgamepad",
             "qtgraphicaleffects", "qtgui", "qthelp", "qtimageformats",
             "qtlabscalendar", "qtlabsplatform", "qtlabscontrols", "qtlinguist",
             "qtlocation", "qtlottieanimation", "qtmaxextras", "qtmultimedia",
             "qtmultimediawidgets", "qtnetwork", "qtnetworkauth", "qtnfc",
             "qtopengl", "qtplatformheaders", "qtpositioning", "qtprintsupport",
-            "qtpurchasing", "qtqml", "qtqmltest", "qtquick", "qtquickcontrols",
-            "qtquickcontrols1", "qtquickdialogs", "qtquickextras",
-            "qtquicklayouts", "qtremoteobjects", "qtscript", "qtscripttools",
-            "qtscxml", "qtsensors", "qtserialbus", "qtserialport", "qtspeech",
-            "qtsql", "qtsvg", "qttest", "qttestlib", "qtuitools",
-            "qtvirtualkeyboard", "qtwaylandcompositor", "qtwebchannel",
-            "qtwebengine", "qtwebenginewidgets", "qtwebkit",
-            "qtwebkitexamples", "qtwebsockets", "qtwebview", "qtwidgets",
-            "qtwinextras", "qtx11extras", "qtxml", "qtxmlpatterns"]
+            "qtpurchasing", "qtqml", "qtqmlmodels", "qtqmltest", "qtquick",
+            "qtquick3d", "qtquickcontrols", "qtquickcontrols1",
+            "qtquickdialogs", "qtquickextras", "qtquicklayouts",
+            "qtquicktimeline", "qtremoteobjects", "qtscript", "qtscripttools",
+            "qtscxml", "qtsensors", "qtserialbus", "qtserialport",
+            "qtshadertools", "qtspeech", "qtsql", "qtsvg", "qttest",
+            "qttestlib", "qtuitools", "qtvirtualkeyboard",
+            "qtwaylandcompositor", "qtwebchannel", "qtwebengine",
+            "qtwebenginewidgets", "qtwebkit", "qtwebkitexamples",
+            "qtwebsockets", "qtwebview", "qtwidgets", "qtwinextras",
+            "qtx11extras", "qtxml", "qtxmlpatterns"]
         for qtDocs, version in [(qt5Docs, 5)]:
             for doc in qtDocs:
                 changes |= self.__installQtDoc(doc, version, engine)
@@ -126,12 +128,7 @@
         if len(lst) == 2:
             qchFile = lst[1]
         
-        if version == 4:
-            docsPath = QDir(
-                QLibraryInfo.path(
-                    QLibraryInfo.LibraryPath.DocumentationPath) +
-                QDir.separator() + "qch")
-        elif version == 5:
+        if version == 5:
             docsPath = QLibraryInfo.path(
                 QLibraryInfo.LibraryPath.DocumentationPath)
             if (