3 files changed, 19 insertions, 22 deletions
diff --git a/src/core/api/qwebenginenotification.cpp b/src/core/api/qwebenginenotification.cpp
index edbb8934f..89fd1eff9 100644
--- a/src/core/api/qwebenginenotification.cpp
+++ b/src/core/api/qwebenginenotification.cpp
@@ -217,18 +217,18 @@ QString QWebEngineNotification::language() const
     \brief The text direction for the notification's title and body.
     \sa title(), message()
 */
-QWebEngineNotification::Direction QWebEngineNotification::direction() const
+Qt::LayoutDirection QWebEngineNotification::direction() const
 {
     Q_D(const QWebEngineNotification);
-    return d ? static_cast<Direction>(d->controller->direction()) : DirectionAuto;
+    return d ? d->controller->direction() : Qt::LayoutDirectionAuto;
 }
 
 /*!
-    Returns \c true if the notification is a default constructed null notification.
+    Returns \c true if the notification is not a default constructed null notification.
 */
-bool QWebEngineNotification::isNull() const
+bool QWebEngineNotification::isValid() const
 {
-    return d_ptr.isNull();
+    return !d_ptr.isNull();
 }
 
 /*!
diff --git a/src/core/api/qwebenginenotification.h b/src/core/api/qwebenginenotification.h
index b6b7414f9..0012e5d78 100644
--- a/src/core/api/qwebenginenotification.h
+++ b/src/core/api/qwebenginenotification.h
@@ -64,22 +64,15 @@ class QWEBENGINECORE_EXPORT QWebEngineNotification : public QObject {
     Q_PROPERTY(QString message READ message CONSTANT FINAL)
     Q_PROPERTY(QString tag READ tag CONSTANT FINAL)
     Q_PROPERTY(QString language READ language CONSTANT FINAL)
-    Q_PROPERTY(Direction direction READ direction CONSTANT FINAL)
+    Q_PROPERTY(Qt::LayoutDirection direction READ direction CONSTANT FINAL)
 
 public:
     QWebEngineNotification();
-    QWebEngineNotification(const QWebEngineNotification &);
+    QWebEngineNotification(const QWebEngineNotification &other);
     virtual ~QWebEngineNotification();
-    const QWebEngineNotification &operator=(const QWebEngineNotification &);
+    const QWebEngineNotification &operator=(const QWebEngineNotification &other);
 
-    enum Direction {
-        LeftToRight = Qt::LeftToRight,
-        RightToLeft = Qt::RightToLeft,
-        DirectionAuto = Qt::LayoutDirectionAuto
-    };
-    Q_ENUM(Direction)
-
-    bool matches(const QWebEngineNotification &) const;
+    bool matches(const QWebEngineNotification &other) const;
 
     QUrl origin() const;
     QIcon icon() const;
@@ -87,9 +80,9 @@ public:
     QString message() const;
     QString tag() const;
     QString language() const;
-    Direction direction() const;
+    Qt::LayoutDirection direction() const;
 
-    bool isNull() const;
+    bool isValid() const;
 
 public Q_SLOTS:
     void show() const;
@@ -100,7 +93,7 @@ Q_SIGNALS:
     void closed();
 
 private:
-    QWebEngineNotification(const QSharedPointer<QtWebEngineCore::UserNotificationController> &);
+    QWebEngineNotification(const QSharedPointer<QtWebEngineCore::UserNotificationController> &controller);
     Q_DECLARE_PRIVATE(QWebEngineNotification)
     QScopedPointer<QWebEngineNotificationPrivate> d_ptr;
     friend class QQuickWebEngineProfilePrivate;
diff --git a/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp b/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp
index c15a80373..da97c4662 100644
--- a/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp
+++ b/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp
@@ -57,11 +57,15 @@ DefaultNotificationPresenter::~DefaultNotificationPresenter()
 
 void DefaultNotificationPresenter::show(const QWebEngineNotification &notification)
 {
-    if (!m_activeNotification.isNull())
+    if (m_activeNotification.isValid()) {
         m_activeNotification.close();
+        m_activeNotification.disconnect(this);
+    }
+
     m_activeNotification = notification;
+
 #ifndef QT_NO_SYSTEMTRAYICON
-    if (m_systemTrayIcon) {
+    if (m_activeNotification.isValid() && m_systemTrayIcon) {
         m_systemTrayIcon->show();
         QIcon icon = notification.icon();
         if (!icon.isNull())
@@ -76,7 +80,7 @@ void DefaultNotificationPresenter::show(const QWebEngineNotification &notificati
 
 void DefaultNotificationPresenter::messageClicked()
 {
-    if (!m_activeNotification.isNull())
+    if (m_activeNotification.isValid())
         m_activeNotification.click();
 }