Merge remote-tracking branch 'origin/5.12' into 5.13

Conflicts:
	src/3rdparty
	src/core/net/network_delegate_qt.cpp
	tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp

Change-Id: Ib715b3047213583e0441b915d3cabb801d9d4ba8

2 files changed, 16 insertions, 0 deletions

diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.cpp b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
index 4575f2929..05c6956ea 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.cpp
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
@@ -43,6 +43,7 @@
 #include "profile_adapter.h"
 #include "qwebengineprofile_p.h"
 
+#include "QFileInfo"
 
 QT_BEGIN_NAMESPACE
 
@@ -534,6 +535,16 @@ void QWebEngineDownloadItem::setPath(QString path)
         return;
     }
 
+    if (QFileInfo(path).fileName().isEmpty()) {
+        qWarning("The download path does not include file name.");
+        return;
+    }
+
+    if (QFileInfo(path).isDir()) {
+        qWarning("The download path matches with an already existing directory path.");
+        return;
+    }
+
     d->downloadPath = path;
 }
 
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 6e33f8692..e63423be8 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -772,6 +772,11 @@
     page.runJavaScript("document.title", [](const QVariant &v) { qDebug() << v.toString(); });
     \endcode
 
+    Only "plain data" can be returned from JavaScript as the result value.
+    Supported data types include all of the JSON data types as well as, for
+    example, \c{Date} and \c{ArrayBuffer}. Unsupported data types include, for
+    example, \c{Function} and \c{Promise}.
+
     \warning Do not execute lengthy routines in the callback function, because it might block the
     rendering of the web engine page.