Updated the list of Qt5 help files in the QtHelp documentation installer. 6_1_x

Sat, 19 Mar 2016 14:39:33 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 19 Mar 2016 14:39:33 +0100
branch
6_1_x
changeset 4872
8f88c4bd5281
parent 4867
9f906009395f
child 4874
8dbca5b1f89c

Updated the list of Qt5 help files in the QtHelp documentation installer.
(grafted from 521d2c98f656378a99e4f3f715201eae6fd6c4eb)

Helpviewer/AdBlock/AdBlockIcon.py file | annotate | diff | comparison | revisions
Helpviewer/HelpDocsInstaller.py file | annotate | diff | comparison | revisions
--- a/Helpviewer/AdBlock/AdBlockIcon.py	Fri Mar 18 19:16:33 2016 +0100
+++ b/Helpviewer/AdBlock/AdBlockIcon.py	Sat Mar 19 14:39:33 2016 +0100
@@ -163,6 +163,9 @@
         @return flag indicating an exception (boolean)
         """
         browser = self.__mw.currentBrowser()
+        if browser is None:
+            return False
+        
         urlHost = browser.page().url().host()
         
         import Helpviewer.HelpWindow
--- a/Helpviewer/HelpDocsInstaller.py	Fri Mar 18 19:16:33 2016 +0100
+++ b/Helpviewer/HelpDocsInstaller.py	Sat Mar 19 14:39:33 2016 +0100
@@ -76,14 +76,15 @@
             "qtconcurrent", "qtcore", "qtdbus", "qtdesigner", "qtdoc",
             "qtenginio", "qtenginiooverview", "qtenginoqml",
             "qtgraphicaleffects", "qtgui", "qthelp", "qtimageformats",
-            "qtlinguist", "qtlocation", "qtmaxextras", "qtmultimedia",
-            "qtmultimediawidgets", "qtnetwork", "qtnfc", "qtopengl",
-            "qtplatformheaders", "qtpositioning", "qtprintsupport", "qtqml",
-            "qtquick", "qtquickcontrols", "qtquickdialogs", "qtquickextras",
-            "qtquicklayouts", "qtscript", "qtscripttools", "qtsensors",
-            "qtserialport", "qtsql", "qtsvg", "qttestlib", "qtuitools",
-            "qtwebchannel", "qtwebengine", "qtwebenginewidgets", "qtwebkit",
-            "qtwebkitexamples", "qtwebsockets", "qtwidgets", "qtwinextras",
+            "qtlabscontrols", "qtlinguist", "qtlocation", "qtmaxextras",
+            "qtmultimedia", "qtmultimediawidgets", "qtnetwork", "qtnfc",
+            "qtopengl", "qtplatformheaders", "qtpositioning", "qtprintsupport",
+            "qtqml", "qtquick", "qtquickcontrols", "qtquickdialogs",
+            "qtquickextras", "qtquicklayouts", "qtscript", "qtscripttools",
+            "qtsensors", "qtserialbus", "qtserialport", "qtsql", "qtsvg",
+            "qttestlib", "qtuitools", "qtwebchannel", "qtwebengine",
+            "qtwebenginewidgets", "qtwebkit", "qtwebkitexamples",
+            "qtwebsockets", "qtwebview", "qtwidgets", "qtwinextras",
             "qtx11extras", "qtxml", "qtxmlpatterns"]
         for qtDocs, version in [(qt4Docs, 4), (qt5Docs, 5)]:
             for doc in qtDocs:

eric ide

mercurial