Mercurial Repositories > eric / file comparison
comparison: eric7/WebBrowser/QtHelp/HelpDocsInstaller.py
eric7/WebBrowser/QtHelp/HelpDocsInstaller.py
- branch
- eric7
- changeset 8602
- 4cff99ec9550
- parent 8549
- 15eca21fd968
- child 8685
- b0669ce1066d
equal
deleted
inserted
replaced
| 8601:018c48d7ae3c | 8602:4cff99ec9550 |
|---|---|
| 67 Public method executed by the thread. | 67 Public method executed by the thread. |
| 68 """ | 68 """ |
| 69 engine = QHelpEngineCore(self.__collection) | 69 engine = QHelpEngineCore(self.__collection) |
| 70 changes = False | 70 changes = False |
| 71 | 71 |
| 72 # TODO: adapt to Qt6 once PyQt 6.2 is available | |
| 73 qt5Docs = [ | 72 qt5Docs = [ |
| 74 "activeqt", "qdoc", "qmake", "qt3d", "qt3drenderer", | 73 "activeqt", "qdoc", "qmake", "qt3d", "qt3drenderer", |
| 75 "qtandroidextras", "qtassistant", "qtbluetooth", "qtcanvas3d", | 74 "qtandroidextras", "qtassistant", "qtbluetooth", "qtcanvas3d", |
| 76 "qtcharts", "qtconcurrent", "qtcore", "qtdatavisualization", | 75 "qtcharts", "qtcmake", "qtconcurrent", "qtcore", "qtdatavis3d", |
| 77 "qtdbus", "qtdesigner", "qtdistancefieldgenerator", "qtdoc", | 76 "qtdatavisualization", "qtdbus", "qtdesigner", |
| 78 "qtenginio", "qtenginiooverview", "qtenginoqml", "qtgamepad", | 77 "qtdistancefieldgenerator", "qtdoc", "qtenginio", |
| 78 "qtenginiooverview", "qtenginoqml", "qtgamepad", | |
| 79 "qtgraphicaleffects", "qtgui", "qthelp", "qtimageformats", | 79 "qtgraphicaleffects", "qtgui", "qthelp", "qtimageformats", |
| 80 "qtlabscalendar", "qtlabsplatform", "qtlabscontrols", "qtlinguist", | 80 "qtlabscalendar", "qtlabsplatform", "qtlabscontrols", "qtlinguist", |
| 81 "qtlocation", "qtlottieanimation", "qtmaxextras", "qtmultimedia", | 81 "qtlocation", "qtlottieanimation", "qtmaxextras", "qtmultimedia", |
| 82 "qtmultimediawidgets", "qtnetwork", "qtnetworkauth", "qtnfc", | 82 "qtmultimediawidgets", "qtnetwork", "qtnetworkauth", "qtnfc", |
| 83 "qtopengl", "qtplatformheaders", "qtpositioning", "qtprintsupport", | 83 "qtopengl", "qtplatformheaders", "qtpositioning", "qtprintsupport", |
| 84 "qtpurchasing", "qtqml", "qtqmltest", "qtquick", "qtquickcontrols", | 84 "qtpurchasing", "qtqml", "qtqmlmodels", "qtqmltest", "qtquick", |
| 85 "qtquickcontrols1", "qtquickdialogs", "qtquickextras", | 85 "qtquick3d", "qtquickcontrols", "qtquickcontrols1", |
| 86 "qtquicklayouts", "qtremoteobjects", "qtscript", "qtscripttools", | 86 "qtquickdialogs", "qtquickextras", "qtquicklayouts", |
| 87 "qtscxml", "qtsensors", "qtserialbus", "qtserialport", "qtspeech", | 87 "qtquicktimeline", "qtremoteobjects", "qtscript", "qtscripttools", |
| 88 "qtsql", "qtsvg", "qttest", "qttestlib", "qtuitools", | 88 "qtscxml", "qtsensors", "qtserialbus", "qtserialport", |
| 89 "qtvirtualkeyboard", "qtwaylandcompositor", "qtwebchannel", | 89 "qtshadertools", "qtspeech", "qtsql", "qtsvg", "qttest", |
| 90 "qtwebengine", "qtwebenginewidgets", "qtwebkit", | 90 "qttestlib", "qtuitools", "qtvirtualkeyboard", |
| 91 "qtwebkitexamples", "qtwebsockets", "qtwebview", "qtwidgets", | 91 "qtwaylandcompositor", "qtwebchannel", "qtwebengine", |
| 92 "qtwinextras", "qtx11extras", "qtxml", "qtxmlpatterns"] | 92 "qtwebenginewidgets", "qtwebkit", "qtwebkitexamples", |
| 93 "qtwebsockets", "qtwebview", "qtwidgets", "qtwinextras", | |
| 94 "qtx11extras", "qtxml", "qtxmlpatterns"] | |
| 93 for qtDocs, version in [(qt5Docs, 5)]: | 95 for qtDocs, version in [(qt5Docs, 5)]: |
| 94 for doc in qtDocs: | 96 for doc in qtDocs: |
| 95 changes |= self.__installQtDoc(doc, version, engine) | 97 changes |= self.__installQtDoc(doc, version, engine) |
| 96 self.__mutex.lock() | 98 self.__mutex.lock() |
| 97 if self.__abort: | 99 if self.__abort: |
| 124 | 126 |
| 125 qchFile = "" | 127 qchFile = "" |
| 126 if len(lst) == 2: | 128 if len(lst) == 2: |
| 127 qchFile = lst[1] | 129 qchFile = lst[1] |
| 128 | 130 |
| 129 if version == 4: | 131 if version == 5: |
| 130 docsPath = QDir( | |
| 131 QLibraryInfo.path( | |
| 132 QLibraryInfo.LibraryPath.DocumentationPath) + | |
| 133 QDir.separator() + "qch") | |
| 134 elif version == 5: | |
| 135 docsPath = QLibraryInfo.path( | 132 docsPath = QLibraryInfo.path( |
| 136 QLibraryInfo.LibraryPath.DocumentationPath) | 133 QLibraryInfo.LibraryPath.DocumentationPath) |
| 137 if ( | 134 if ( |
| 138 not os.path.isdir(docsPath) or | 135 not os.path.isdir(docsPath) or |
| 139 len(QDir(docsPath).entryList(["*.qch"])) == 0 | 136 len(QDir(docsPath).entryList(["*.qch"])) == 0 |
