summaryrefslogtreecommitdiffstats
path: root/src/plugins/webengine/qwebenginewebview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/webengine/qwebenginewebview.cpp')
-rw-r--r--src/plugins/webengine/qwebenginewebview.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/plugins/webengine/qwebenginewebview.cpp b/src/plugins/webengine/qwebenginewebview.cpp
index f16371d..7870b3a 100644
--- a/src/plugins/webengine/qwebenginewebview.cpp
+++ b/src/plugins/webengine/qwebenginewebview.cpp
@@ -81,8 +81,11 @@ QString QWebEngineWebViewPrivate::httpUserAgent() const
void QWebEngineWebViewPrivate::setHttpUserAgent(const QString &userAgent)
{
- m_profile->setHttpUserAgent(userAgent);
- Q_EMIT httpUserAgentChanged(userAgent);
+ m_httpUserAgent = userAgent;
+ if (m_profile) {
+ m_profile->setHttpUserAgent(userAgent);
+ Q_EMIT httpUserAgentChanged(userAgent);
+ }
}
QUrl QWebEngineWebViewPrivate::url() const
@@ -255,7 +258,12 @@ void QWebEngineWebViewPrivate::QQuickWebEngineViewPtr::init() const
Q_ASSERT(webEngineView);
QQuickWebEngineProfile *profile = webEngineView->profile();
m_parent->m_profile = profile;
- m_parent->m_httpUserAgent = profile->httpUserAgent();
+ // When the httpUserAgent is set as a property then it will be set before
+ // init() is called
+ if (m_parent->m_httpUserAgent.isEmpty())
+ m_parent->m_httpUserAgent = profile->httpUserAgent();
+ else
+ profile->setHttpUserAgent(m_parent->m_httpUserAgent);
QObject::connect(webEngineView, &QQuickWebEngineView::urlChanged, m_parent, &QWebEngineWebViewPrivate::q_urlChanged);
QObject::connect(webEngineView, &QQuickWebEngineView::loadProgressChanged, m_parent, &QWebEngineWebViewPrivate::q_loadProgressChanged);
QObject::connect(webEngineView, &QQuickWebEngineView::loadingChanged, m_parent, &QWebEngineWebViewPrivate::q_loadingChanged);