diff options
| author | Kirill Burtsev <kirill.burtsev@qt.io> | 2019-03-20 18:04:50 +0100 |
|---|---|---|
| committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2019-04-05 08:20:49 +0000 |
| commit | d2fa5fd0f5b1972bd372510cc14509e85b972b23 (patch) | |
| tree | 0f36120b208394729aff28de483369591f38ad4b /src/webengine | |
| parent | 320c7316b75be22112cb4802187c3873c9934eab (diff) | |
Notification API cleanup
Task-number: QTBUG-74543
Change-Id: Ice5a0dbfc3485c8b7e6fa900ef427a9aed871d42
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebengineprofile.cpp | 6 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineprofile.h | 2 | ||||
| -rw-r--r-- | src/webengine/plugin/plugins.qmltypes | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp index ac75b5356..4832ba303 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -152,7 +152,7 @@ ASSERT_ENUMS_MATCH(QQuickWebEngineDownloadItem::MimeHtmlSaveFormat, QtWebEngineC */ /*! - \fn QQuickWebEngineProfile::userNotification(QWebEngineNotification *notification) + \fn QQuickWebEngineProfile::presentNotification(QWebEngineNotification *notification) This signal is emitted whenever there is a newly created user notification. The \a notification argument holds the notification instance to query data and interact with. @@ -304,7 +304,7 @@ void QQuickWebEngineProfilePrivate::showNotification(QSharedPointer<QtWebEngineC Q_Q(QQuickWebEngineProfile); auto notification = new QWebEngineNotification(controller); QQmlEngine::setObjectOwnership(notification, QQmlEngine::JavaScriptOwnership); - Q_EMIT q->userNotification(notification); + Q_EMIT q->presentNotification(notification); } void QQuickWebEngineProfilePrivate::userScripts_append(QQmlListProperty<QQuickWebEngineScript> *p, QQuickWebEngineScript *script) @@ -387,7 +387,7 @@ void QQuickWebEngineProfilePrivate::userScripts_clear(QQmlListProperty<QQuickWeb */ /*! - \qmlsignal WebEngineProfile::userNotification(WebEngineNotification notification) + \qmlsignal WebEngineProfile::presentNotification(WebEngineNotification notification) \since QtWebEngine 1.9 This signal is emitted whenever there is a newly created user notification. diff --git a/src/webengine/api/qquickwebengineprofile.h b/src/webengine/api/qquickwebengineprofile.h index e6f9fb73d..e5f7ff713 100644 --- a/src/webengine/api/qquickwebengineprofile.h +++ b/src/webengine/api/qquickwebengineprofile.h @@ -176,7 +176,7 @@ Q_SIGNALS: void downloadRequested(QQuickWebEngineDownloadItem *download); void downloadFinished(QQuickWebEngineDownloadItem *download); - Q_REVISION(5) void userNotification(QWebEngineNotification *notification); + Q_REVISION(5) void presentNotification(QWebEngineNotification *notification); private: Q_DECLARE_PRIVATE(QQuickWebEngineProfile) diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes index cc2ed502d..0037861e5 100644 --- a/src/webengine/plugin/plugins.qmltypes +++ b/src/webengine/plugin/plugins.qmltypes @@ -531,7 +531,7 @@ Module { Parameter { name: "download"; type: "QQuickWebEngineDownloadItem"; isPointer: true } } Signal { - name: "userNotification" + name: "presentNotification" revision: 5 Parameter { name: "notification"; type: "QWebEngineNotification"; isPointer: true } } |