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

Change-Id: I20e36d0e18dd26365557a4093436e9660e30e173

2 files changed, 3 insertions, 1 deletions

diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 1897664e3..59fa0a9a8 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -105,6 +105,7 @@ content::WebContents *WebContentsDelegateQt::OpenURLFromTab(content::WebContents
     load_url_params.extra_headers = params.extra_headers;
     load_url_params.should_replace_current_entry = params.should_replace_current_entry;
     load_url_params.is_renderer_initiated = params.is_renderer_initiated;
+    load_url_params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE;
 
     if (params.transferred_global_request_id != content::GlobalRequestID())
         load_url_params.transferred_global_request_id = params.transferred_global_request_id;
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index affffbf46..71dad701f 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -37,6 +37,7 @@
 #include "qquickwebenginescript_p.h"
 #include "qquickwebenginescript_p_p.h"
 
+#include <QQmlFile>
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtCore/QStringBuilder>
@@ -178,7 +179,7 @@ void QQuickWebEngineScript::setSourceUrl(QUrl arg)
     d->m_sourceUrl = arg;
     Q_EMIT sourceUrlChanged(d->m_sourceUrl);
 
-    QFile f(arg.toLocalFile());
+    QFile f(QQmlFile::urlToLocalFileOrQrc(arg));
     if (!f.open(QIODevice::ReadOnly)) {
         qWarning() << "Can't open user script " << arg;
         return;