diff options
Diffstat (limited to 'src/webenginequick/api/qquickwebengineprofile.cpp')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineprofile.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/webenginequick/api/qquickwebengineprofile.cpp b/src/webenginequick/api/qquickwebengineprofile.cpp index 80e4ec5ac..51996b6d9 100644 --- a/src/webenginequick/api/qquickwebengineprofile.cpp +++ b/src/webenginequick/api/qquickwebengineprofile.cpp @@ -6,7 +6,6 @@ #include "qquickwebenginedownloadrequest.h" #include "qquickwebenginesettings_p.h" #include "qquickwebenginescriptcollection_p.h" -#include "qquickwebenginescriptcollection_p_p.h" #include "qquickwebengineview_p_p.h" #include "profile_adapter.h" @@ -23,7 +22,6 @@ #include <QtCore/qdir.h> #include <QtCore/qfileinfo.h> -#include <QtQml/qqmlcontext.h> #include <QtQml/qqmlengine.h> #include <QtQml/qqmlinfo.h> @@ -332,16 +330,12 @@ void QQuickWebEngineProfilePrivate::clearHttpCacheCompleted() QQuickWebEngineScriptCollection *QQuickWebEngineProfilePrivate::getUserScripts() { - Q_Q(QQuickWebEngineProfile); if (!m_scriptCollection) m_scriptCollection.reset( new QQuickWebEngineScriptCollection( - new QQuickWebEngineScriptCollectionPrivate( + new QWebEngineScriptCollection( new QWebEngineScriptCollectionPrivate( - m_profileAdapter->userResourceController())))); - - if (!m_scriptCollection->qmlEngine()) - m_scriptCollection->setQmlEngine(qmlEngine(q)); + profileAdapter()->userResourceController())))); return m_scriptCollection.data(); } @@ -1336,14 +1330,6 @@ QList<QWebEnginePermission> QQuickWebEngineProfile::listPermissionsForPermission return d->profileAdapter()->listPermissions(QUrl(), permissionType); } -void QQuickWebEngineProfile::ensureQmlContext(const QObject *object) -{ - if (!qmlContext(this)) { - auto engine = qmlEngine(object); - QQmlEngine::setContextForObject(this, new QQmlContext(engine, engine)); - } -} - QT_END_NAMESPACE #include "moc_qquickwebengineprofile.cpp" |
