Merge remote-tracking branch 'origin/5.9' into dev

src/3rdparty used sha1 from 5.9, because both 5.9 and dev are
using same branch now.

Conflicts:
	src/3rdparty
	tests/auto/widgets/qwebenginepage/BLACKLIST

Change-Id: I16a33e0f91779d1ee3a230070ff4248699c2e1bd

1 files changed, 12 insertions, 1 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 724418ee2..45b6af763 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -102,6 +102,17 @@ static const int MaxTooltipLength = 1024;
 #if defined(ENABLE_PRINTING) && defined(ENABLE_PDF)
 static bool printPdfDataOnPrinter(const QByteArray& data, QPrinter& printer)
 {
+    if (!data.size()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
+        qWarning("Failure to print on printer %ls: Print result data is empty.",
+                 qUtf16Printable(printer.printerName()));
+#else
+        qWarning("Failure to print on printer %s: Print result data is empty.",
+                 qPrintable(printer.printerName()));
+#endif
+        return false;
+    }
+
     QRect printerPageRect = printer.pageRect();
     PdfiumDocumentWrapperQt pdfiumWrapper(data.constData(), data.size(), printerPageRect.size());
 
@@ -1530,7 +1541,7 @@ void QWebEnginePagePrivate::javascriptDialog(QSharedPointer<JavaScriptDialogCont
             controller->textProvided(promptResult);
         break;
     case UnloadDialog:
-        accepted = (QMessageBox::question(view, QCoreApplication::translate("QWebEnginePage", "Are you sure you want to leave this page?"), QCoreApplication::translate("QWebEnginePage", "Changes that you made may not be saved."), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok);
+        accepted = q->javaScriptConfirm(controller->securityOrigin(), QCoreApplication::translate("QWebEnginePage", "Are you sure you want to leave this page? Changes that you made may not be saved."));
         break;
     case InternalAuthorizationDialog:
         accepted = (QMessageBox::question(view, controller->title(), controller->message(), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes);