diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2025-08-06 13:11:09 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2025-08-26 08:46:13 +0200 |
| commit | b02b9fb4346bd99164256f43d02b4bd85637b11b (patch) | |
| tree | 3a5f1c263c9275d1de42c1c697e8f75d76e7c83e /src/webenginequick/api/qquickwebengineview.cpp | |
| parent | 8768693c8d45d7c4d99ebc51f226d1baae7a1af1 (diff) | |
Remove unnecessary QQmlEngine usage
Reverts most of f5fbc34fc16fc9c6e7f7e8bbbf60f5b343b9466d, relying on
better implicit QML conversion since.
Fixes: QTBUG-138881
Pick-to: 6.10 6.9 6.8
Change-Id: Ic23579e421f737b9a4d85c7e4f1a4019323c4be9
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/webenginequick/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 619cbaef6..8d95e9239 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -10,7 +10,6 @@ #include "qquickwebengineprofile.h" #include "qquickwebengineprofile_p.h" #include "qquickwebenginescriptcollection_p.h" -#include "qquickwebenginescriptcollection_p_p.h" #include "qquickwebenginesettings_p.h" #include "qquickwebenginetouchhandleprovider_p_p.h" #include "qquickwebenginetouchhandle_p.h" @@ -345,14 +344,9 @@ void QQuickWebEngineViewPrivate::initializeProfile() Q_ASSERT(!adapter->isInitialized()); m_profileInitialized = true; - if (!m_profile) { + if (!m_profile) m_profile = QQuickWebEngineProfile::defaultProfile(); - // MEMO first ever call to default profile will create one without context - // it needs something to get qml engine from (and view is created in qml land) - m_profile->ensureQmlContext(q_ptr); - } - m_profile->d_ptr->addWebContentsAdapterClient(this); m_settings.reset(new QQuickWebEngineSettings(m_profile->settings())); adapter->setClient(this); @@ -1161,17 +1155,13 @@ void QQuickWebEngineViewPrivate::updateEditActions() QQuickWebEngineScriptCollection *QQuickWebEngineViewPrivate::getUserScripts() { - Q_Q(QQuickWebEngineView); if (!m_scriptCollection) m_scriptCollection.reset( new QQuickWebEngineScriptCollection( - new QQuickWebEngineScriptCollectionPrivate( + new QWebEngineScriptCollection( new QWebEngineScriptCollectionPrivate( profileAdapter()->userResourceController(), adapter)))); - if (!m_scriptCollection->qmlEngine()) - m_scriptCollection->setQmlEngine(qmlEngine(q)); - return m_scriptCollection.data(); } |