1 files changed, 8 insertions, 10 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 40e9b9723a..d4c1f2ade3 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -436,11 +436,14 @@ void QWindow::setVisible(bool visible)
         QCoreApplication::removePostedEvents(qApp, QEvent::Quit);
 
         if (type() == Qt::Window) {
-            QString &firstWindowTitle = QGuiApplicationPrivate::instance()->firstWindowTitle;
+            QGuiApplicationPrivate *app_priv = QGuiApplicationPrivate::instance();
+            QString &firstWindowTitle = app_priv->firstWindowTitle;
             if (!firstWindowTitle.isEmpty()) {
                 setTitle(firstWindowTitle);
                 firstWindowTitle = QString();
             }
+            if (!app_priv->forcedWindowIcon.isNull())
+                setIcon(app_priv->forcedWindowIcon);
         }
 
         QShowEvent showEvent;
@@ -1942,15 +1945,10 @@ bool QWindow::event(QEvent *ev)
         break;
 #endif
 
-    case QEvent::Close: {
-        Q_D(QWindow);
-        bool wasVisible = isVisible();
-        if (ev->isAccepted()) {
-            destroy();
-            if (wasVisible)
-                d->maybeQuitOnLastWindowClosed();
-        }
-        break; }
+    case QEvent::Close:
+        if (ev->isAccepted())
+            close();
+        break;
 
     case QEvent::Expose:
         exposeEvent(static_cast<QExposeEvent *>(ev));