diff -r 1948b27d7b21 -r e2782c9a43d4 WebBrowser/WebBrowserWindow.py
--- a/WebBrowser/WebBrowserWindow.py Tue Sep 27 19:41:11 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py Wed Sep 28 20:04:44 2016 +0200
@@ -701,8 +701,8 @@
bookmarksManager.exportBookmarks)
self.__actions.append(self.exportBookmarksAct)
- if not Globals.isWindowsPlatform():
- # TODO: implement printing based on printToPdf()
+ if not Globals.isWindowsPlatform() or \
+ qVersion() >= "5.7.0":
self.printAct = E5Action(
self.tr('Print'),
UI.PixmapCache.getIcon("print.png"),
@@ -739,7 +739,7 @@
else:
self.printPdfAct = None
- if not Globals.isWindowsPlatform():
+ if not Globals.isWindowsPlatform() and qVersion() < "5.7.0":
self.printPreviewAct = E5Action(
self.tr('Print Preview'),
UI.PixmapCache.getIcon("printPreview.png"),
@@ -1956,7 +1956,8 @@
filetb.addAction(self.printAct)
if self.printPdfAct:
filetb.addAction(self.printPdfAct)
- filetb.addSeparator()
+ if self.printPreviewAct or self.printAct or self.printPdfAct:
+ filetb.addSeparator()
filetb.addAction(self.closeAct)
filetb.addAction(self.exitAct)
