Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I4aa5c960a03616d95f9e1d10b4c8ba222997a24d

1 files changed, 5 insertions, 1 deletions

diff --git a/src/dialogs/qquickabstractdialog.cpp b/src/dialogs/qquickabstractdialog.cpp
index 03f3b490..41aa1bdc 100644
--- a/src/dialogs/qquickabstractdialog.cpp
+++ b/src/dialogs/qquickabstractdialog.cpp
@@ -57,6 +57,7 @@ QQuickAbstractDialog::QQuickAbstractDialog(QObject *parent)
         QGuiApplicationPrivate::platformIntegration()->
         hasCapability(QPlatformIntegration::WindowManagement))
     , m_hasAspiredPosition(false)
+    , m_visibleChangedConnected(false)
 {
 }
 
@@ -137,12 +138,15 @@ void QQuickAbstractDialog::setVisible(bool v)
                     if (m_sizeAspiration.height() > 0)
                         m_dialogWindow->setHeight(m_sizeAspiration.height());
                 }
-                connect(m_dialogWindow, SIGNAL(visibleChanged(bool)), this, SLOT(visibleChanged(bool)));
                 connect(m_dialogWindow, SIGNAL(xChanged(int)), this, SLOT(setX(int)));
                 connect(m_dialogWindow, SIGNAL(yChanged(int)), this, SLOT(setY(int)));
                 connect(m_dialogWindow, SIGNAL(widthChanged(int)), this, SLOT(setWidth(int)));
                 connect(m_dialogWindow, SIGNAL(heightChanged(int)), this, SLOT(setHeight(int)));
             }
+            if (!m_visibleChangedConnected) {
+                connect(m_dialogWindow, SIGNAL(visibleChanged(bool)), this, SLOT(visibleChanged(bool)));
+                m_visibleChangedConnected = true;
+            }
         }
         if (m_windowDecoration) {
             m_windowDecoration->setProperty("dismissOnOuterClick", (m_modality == Qt::NonModal));