From 293dee361a8483aaa5bc3de49b896f012f1b337d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 10 Apr 2017 21:25:20 +0200 Subject: Connect to QQuickWindow::visibleChanged using QObject member syntax To disambiguate from QWindow::visibleChanged. Otherwise we get a warning at runtime: QMetaObject::indexOfSignal: signal visibleChanged(bool) from QQuickWindow redefined in QQuickWindowQmlImpl Change-Id: I95f984cface59cd7ec5710235959a1054b26275a Reviewed-by: Shawn Rutledge --- src/dialogs/qquickabstractdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialogs/qquickabstractdialog.cpp b/src/dialogs/qquickabstractdialog.cpp index 65237652..ce87d56c 100644 --- a/src/dialogs/qquickabstractdialog.cpp +++ b/src/dialogs/qquickabstractdialog.cpp @@ -187,7 +187,7 @@ void QQuickAbstractDialog::setVisible(bool v) connect(m_contentItem, SIGNAL(implicitHeightChanged()), this, SLOT(implicitHeightChanged())); } if (!m_visibleChangedConnected) { - connect(m_dialogWindow, SIGNAL(visibleChanged(bool)), this, SLOT(visibleChanged(bool))); + connect(m_dialogWindow, &QQuickWindow::visibleChanged, this, &QQuickAbstractDialog::visibleChanged); m_visibleChangedConnected = true; } } @@ -328,7 +328,7 @@ void QQuickAbstractDialog::setContentItem(QQuickItem *obj) m_contentItem = obj; qCDebug(lcWindow) << obj; if (m_dialogWindow) { - disconnect(this, SLOT(visibleChanged(bool))); + disconnect(m_dialogWindow, &QQuickWindow::visibleChanged, this, &QQuickAbstractDialog::visibleChanged); // Can't necessarily delete because m_dialogWindow might have been provided by the QML. m_dialogWindow = 0; } -- cgit v1.2.1