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

Conflicts:
	src/core/browser_context_qt.cpp
	src/webengine/api/qquickwebengineview_p.h

Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c

8 files changed, 20 insertions, 16 deletions

diff --git a/examples/webengine/quicknanobrowser/quickwindow.qml b/examples/webengine/quicknanobrowser/quickwindow.qml
index c73951046..b954629fb 100644
--- a/examples/webengine/quicknanobrowser/quickwindow.qml
+++ b/examples/webengine/quicknanobrowser/quickwindow.qml
@@ -51,8 +51,8 @@ ApplicationWindow {
     function load(url) { currentWebView.url = url }
     property Item currentWebView: tabs.currentIndex < tabs.count ? tabs.getTab(tabs.currentIndex).item : null
 
-    height: 600
-    width: 800
+    width: 1300
+    height: 900
     visible: true
     title: currentWebView && currentWebView.title
 
diff --git a/examples/webengine/quicknanobrowser/util.h b/examples/webengine/quicknanobrowser/util.h
index 85db8c25b..ca0f5f1d5 100644
--- a/examples/webengine/quicknanobrowser/util.h
+++ b/examples/webengine/quicknanobrowser/util.h
@@ -66,7 +66,7 @@ QUrl startupUrl()
         if (ret.isValid())
             return ret;
     }
-    return QUrl(QStringLiteral("http://qt-project.org/"));
+    return QUrl(QStringLiteral("http://qt.io/"));
 }
 
 
diff --git a/examples/webenginewidgets/browser/browsermainwindow.cpp b/examples/webenginewidgets/browser/browsermainwindow.cpp
index 587e66490..cce603cff 100644
--- a/examples/webenginewidgets/browser/browsermainwindow.cpp
+++ b/examples/webenginewidgets/browser/browsermainwindow.cpp
@@ -88,6 +88,8 @@ InvokeWrapper<Arg, R, C> invoke(R *receiver, void (C::*memberFun)(Arg))
     return wrapper;
 }
 
+const char *BrowserMainWindow::defaultHome = "http://qt.io/";
+
 BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
     : QMainWindow(parent, flags)
     , m_tabWidget(new TabWidget(this))
@@ -825,7 +827,7 @@ void BrowserMainWindow::slotHome()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString home = settings.value(QLatin1String("home"), QLatin1String("http://qt-project.org/")).toString();
+    QString home = settings.value(QLatin1String("home"), QLatin1String(defaultHome)).toString();
     loadPage(home);
 }
 
diff --git a/examples/webenginewidgets/browser/browsermainwindow.h b/examples/webenginewidgets/browser/browsermainwindow.h
index 6743d8e79..da767e35e 100644
--- a/examples/webenginewidgets/browser/browsermainwindow.h
+++ b/examples/webenginewidgets/browser/browsermainwindow.h
@@ -70,6 +70,8 @@ public:
     ~BrowserMainWindow();
     QSize sizeHint() const;
 
+    static const char *defaultHome;
+
 public:
     TabWidget *tabWidget() const;
     WebView *currentTab() const;
diff --git a/examples/webenginewidgets/browser/data/defaultbookmarks.xbel b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel
index 7a95e36b3..a981d2de2 100644
--- a/examples/webenginewidgets/browser/data/defaultbookmarks.xbel
+++ b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel
@@ -3,18 +3,12 @@
 <xbel version="1.0">
     <folder folded="yes">
         <title>Bookmarks Bar</title>
-        <bookmark href="http://qt-project.org/">
+        <bookmark href="http://qt.io/">
             <title>Qt Home Page</title>
         </bookmark>
-        <bookmark href="http://webkit.org/">
-            <title>WebKit.org</title>
-        </bookmark>
         <bookmark href="http://qt-project.org/doc/">
             <title>Qt Documentation</title>
         </bookmark>
-        <bookmark href="http://qt-project.org/quarterly/">
-            <title>Qt Quarterly</title>
-        </bookmark>
         <bookmark href="http://planet.qt-project.org/">
             <title>Qt Blog</title>
         </bookmark>
@@ -27,6 +21,9 @@
         <bookmark href="http://qt-project.org/wiki/OnlineCommunities/">
             <title>Online Communities</title>
         </bookmark>
+        <bookmark href="http://www.chromium.org/">
+            <title>The Chromium Projects</title>
+        </bookmark>
        <bookmark href="http://xkcd.com/">
             <title>xkcd</title>
         </bookmark>
diff --git a/examples/webenginewidgets/browser/featurepermissionbar.cpp b/examples/webenginewidgets/browser/featurepermissionbar.cpp
index 2cc9907bd..98f19ad1f 100644
--- a/examples/webenginewidgets/browser/featurepermissionbar.cpp
+++ b/examples/webenginewidgets/browser/featurepermissionbar.cpp
@@ -56,11 +56,11 @@ static QString textForPermissionType(QWebEnginePage::Feature type)
         return QObject::tr("desktop notifications");
     case QWebEnginePage::Geolocation:
         return QObject::tr("your position");
-    case QWebEnginePage::MediaAudioDevices:
+    case QWebEnginePage::MediaAudioCapture:
         return QObject::tr("your microphone");
-    case QWebEnginePage::MediaVideoDevices:
+    case QWebEnginePage::MediaVideoCapture:
         return QObject::tr("your camera");
-    case QWebEnginePage::MediaAudioVideoDevices:
+    case QWebEnginePage::MediaAudioVideoCapture:
         return QObject::tr("your camera and microphone");
     default:
         Q_UNREACHABLE();
diff --git a/examples/webenginewidgets/browser/settings.cpp b/examples/webenginewidgets/browser/settings.cpp
index d89c49353..835e7a9b5 100644
--- a/examples/webenginewidgets/browser/settings.cpp
+++ b/examples/webenginewidgets/browser/settings.cpp
@@ -95,7 +95,7 @@ void SettingsDialog::loadFromSettings()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString defaultHome = QLatin1String("http://qt-project.org/");
+    const QString defaultHome = QLatin1String(BrowserMainWindow::defaultHome);
     homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
     settings.endGroup();
 
diff --git a/examples/webenginewidgets/browser/webview.cpp b/examples/webenginewidgets/browser/webview.cpp
index 07027fe3a..9b42f2ab2 100644
--- a/examples/webenginewidgets/browser/webview.cpp
+++ b/examples/webenginewidgets/browser/webview.cpp
@@ -113,7 +113,10 @@ bool WebPage::certificateError(const QWebEngineCertificateError &error)
         QMessageBox msgBox;
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setText(error.errorDescription());
-        msgBox.setInformativeText(tr("If you wish so, you may continue with an unverified certicate. Accepting an unverified certicate means you may not be connected with the host you tried to connect to.\nDo you wish to override the security check and continue?"));
+        msgBox.setInformativeText(tr("If you wish so, you may continue with an unverified certificate. "
+                                     "Accepting an unverified certificate means "
+                                     "you may not be connected with the host you tried to connect to.\n"
+                                     "Do you wish to override the security check and continue?"));
         msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
         msgBox.setDefaultButton(QMessageBox::No);
         return msgBox.exec() == QMessageBox::Yes;