Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Thu Nov 23 17:50:51 2017 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sat Nov 25 13:49:54 2017 +0100
@@ -816,10 +816,8 @@
                 bookmarksManager.exportBookmarks)
         self.__actions.append(self.exportBookmarksAct)
         
-        # TODO: re-check this once printing on Windows is reliable
-##        if qVersionTuple() >= (5, 8, 0) or (
-##            not Globals.isWindowsPlatform() or qVersionTuple() >= (5, 7, 0)):
-        if not Globals.isWindowsPlatform() and qVersionTuple() >= (5, 7, 0):
+        if qVersionTuple() >= (5, 8, 0) or (
+            not Globals.isWindowsPlatform() or qVersionTuple() >= (5, 7, 0)):
             self.printAct = E5Action(
                 self.tr('Print'),
                 UI.PixmapCache.getIcon("print.png"),
@@ -856,11 +854,8 @@
         else:
             self.printPdfAct = None
         
-        # TODO: re-check this once printing on Windows is reliable
-##        if qVersionTuple() >= (5, 8, 0) or (
-##            not Globals.isWindowsPlatform() and qVersionTuple() < (5, 7, 0)):
-        if not Globals.isWindowsPlatform() and (
-                qVersionTuple() < (5, 7, 0) or qVersionTuple() >= (5, 8, 0)):
+        if qVersionTuple() >= (5, 8, 0) or (
+            not Globals.isWindowsPlatform() and qVersionTuple() < (5, 7, 0)):
             self.printPreviewAct = E5Action(
                 self.tr('Print Preview'),
                 UI.PixmapCache.getIcon("printPreview.png"),