Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserTabWidget.py	Sat Feb 18 12:23:35 2017 +0100
+++ b/WebBrowser/WebBrowserTabWidget.py	Sat Feb 18 19:59:14 2017 +0100
@@ -638,11 +638,14 @@
             if FilePrinter.isCupsAvailable():
                 printDialog.setOption(QAbstractPrintDialog.PrintCollateCopies)
             printDialog.setOption(QAbstractPrintDialog.PrintPageRange)
-        # TODO: Add Qt 5.8 print support
         if printDialog.exec_() == QDialog.Accepted:
-            if not hasattr(browser.page(), "printToPdf"):
-                browser.render(printer)
-            else:
+            # TODO: enable this once it works correctly in Qt
+##            if hasattr(browser.page(), "print"):
+##                # Qt >= 5.8.0
+##                browser.page().printPage(printer)
+##            elif hasattr(browser.page(), "printToPdf"):
+            if hasattr(browser.page(), "printToPdf"):
+                # Qt >= 5.7.0
                 if printer.outputFormat() == QPrinter.PdfFormat:
                     # print to PDF file selected
                     browser.page().printToPdf(
@@ -655,6 +658,8 @@
                     browser.page().printToPdf(
                         self.__pdfGeneratedForPrinting,
                         printer.pageLayout())
+        else:
+            browser.render(printer)
     
     @pyqtSlot()
     def printBrowserPdf(self, browser=None):