Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/3rdparty
	src/core/browser_context_adapter.cpp
	src/core/web_contents_adapter.cpp
	tests/auto/widgets/qwebenginepage/BLACKLIST

Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf

3 files changed, 21 insertions, 4 deletions

diff --git a/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro b/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro
index 66ea064ef..6b249cf59 100644
--- a/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro
+++ b/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro
@@ -17,3 +17,6 @@ FORMS += \
 
 RESOURCES += \
     cookiebrowser.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/cookiebrowser
+INSTALLS += target
diff --git a/examples/webenginewidgets/demobrowser/demobrowser.pro b/examples/webenginewidgets/demobrowser/demobrowser.pro
index 87f362f90..aef7b9eac 100644
--- a/examples/webenginewidgets/demobrowser/demobrowser.pro
+++ b/examples/webenginewidgets/demobrowser/demobrowser.pro
@@ -86,7 +86,9 @@ mac {
     TARGET = Demobrowser
 }
 
-EXAMPLE_FILES = Info_mac.plist demobrowser.icns demobrowser.ico demobrowser.rc
+EXAMPLE_FILES = \
+    Info_mac.plist demobrowser.icns demobrowser.ico demobrowser.rc \
+    cookiejar.h cookiejar.cpp  # FIXME: these are currently unused.
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/demobrowser
diff --git a/examples/webenginewidgets/simplebrowser/main.cpp b/examples/webenginewidgets/simplebrowser/main.cpp
index 761403fb5..750e7ae43 100644
--- a/examples/webenginewidgets/simplebrowser/main.cpp
+++ b/examples/webenginewidgets/simplebrowser/main.cpp
@@ -42,6 +42,18 @@
 #include "browserwindow.h"
 #include <QApplication>
 
+QString getCommandLineUrlArgument()
+{
+    const QStringList args = QCoreApplication::arguments();
+    if (args.count() > 1) {
+        const QString lastArg = args.last();
+        const bool isValidUrl = QUrl::fromUserInput(lastArg).isValid();
+        if (isValidUrl)
+            return lastArg;
+    }
+    return QString();
+}
+
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
@@ -50,9 +62,9 @@ int main(int argc, char **argv)
     BrowserWindow *window = new BrowserWindow();
     Browser::instance().addWindow(window);
 
-    QStringList args = QCoreApplication::arguments();
-    if (args.count() > 1)
-        window->loadPage(args.last());
+    const QString url = getCommandLineUrlArgument();
+    if (!url.isEmpty())
+        window->loadPage(url);
     else
         window->loadHomePage();