path: root/tests/auto/corelib/global
diff options
authorOlivier Goffart <>2011-11-11 17:01:06 +0100
committerQt by Nokia <>2011-11-25 01:12:14 +0100
commit79f675a1e0f628bbc25345ebc1eb1f5809166c6b (patch)
tree998a846e047fcadb588d9922f6aa8aaa6bd562e0 /tests/auto/corelib/global
parente759f9580ef0a76131c7540015a87968742fce9f (diff)
Change the return value of QObject::connect
From a bool to a handle to to connection. Also added a new overload of disconnect that disconnect a handle This is required because with the new syntax taking lambda or functors, it is the only way to disconnect a connection (as it is impossible to compare functors) The new return value is QMetaObject::Connection, it is a wrapper around the internal QObjectPrivate::Connection. QObjectPrivate::Connection is now reference counted. tst_qglobal.cpp: This test set up an internal callback, and the callback do not set any proper connection handle (and tbh, it would be hard for it to do so). So the returned QMetaObject::Connection is invalid, and ok is false (Internal callbacks are only used for jambi and should probably be removed) Change-Id: I111626fb4f47efc4db5e2ea5bff9da15f08fea7b Reviewed-by: Bradley T. Hughes <> Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'tests/auto/corelib/global')
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
index c0a14faac3..b3115e036e 100644
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -110,7 +110,7 @@ void tst_QGlobal::qInternalCallbacks()
// Test that connect works as expected...
bool ok = QObject::connect(&a, signal.toLatin1(), &b, slot.toLatin1(), Qt::AutoConnection);
- QVERIFY(ok);
+ QVERIFY(!ok); // our dummy callback do not return a valid QMetaObject::Connection
QCOMPARE(&a, connect_info.sender);
QCOMPARE(&b, connect_info.receiver);
QCOMPARE(signal, connect_info.signal);