summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Arne Vestbø <torarnv@gmail.com>2017-04-10 21:25:20 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-04-18 08:54:14 +0000
commit293dee361a8483aaa5bc3de49b896f012f1b337d (patch)
tree3233033aadda49e85bf361372cc8aa355c76aeee
parent751f08cf46f505980b8ebe9a228a6c229b470152 (diff)
downloadqtquickcontrols-293dee361a8483aaa5bc3de49b896f012f1b337d.tar.gz
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 <shawn.rutledge@qt.io>
-rw-r--r--src/dialogs/qquickabstractdialog.cpp4
1 files 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;
}