diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-04-17 15:04:23 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-04-17 15:04:23 (GMT) |
| commit | c29533ab2094c38bb63d50dd6306cfe6ccacc868 (patch) | |
| tree | e539b2062c870dd431f522d1d1e0677008eaa717 /tests/auto/qobject | |
| parent | f15b8a83e2e51955776a3f07cb85ebfc342dd8ef (diff) | |
| parent | 198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (diff) | |
| download | Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.zip Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.tar.gz Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.tar.bz2 | |
Merge branch 'kinetic-animations' into kinetic-statemachine
Diffstat (limited to 'tests/auto/qobject')
| -rw-r--r-- | tests/auto/qobject/tst_qobject.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp index 096f1c5..fb46073 100644 --- a/tests/auto/qobject/tst_qobject.cpp +++ b/tests/auto/qobject/tst_qobject.cpp @@ -264,13 +264,9 @@ void tst_QObject::disconnect() QCOMPARE( r1->called(1), FALSE ); r1->reset(); -#if QT_VERSION >= 0x030100 QCOMPARE( ret, TRUE ); -#endif ret = QObject::disconnect( s, SIGNAL( signal1() ), r1, SLOT( slot1() ) ); -#if QT_VERSION >= 0x030100 QCOMPARE( ret, FALSE ); -#endif // disconnect all signals from s from all slots from r1 QObject::disconnect( s, 0, r1, 0 ); @@ -702,12 +698,10 @@ void tst_QObject::connectDisconnectNotify() QCOMPARE( s->org_signal, s->nw_signal ); QCOMPARE( s->org_signal.toLatin1(), QMetaObject::normalizedSignature(a_signal.toLatin1().constData()) ); -#if QT_VERSION > 0x040101 // Reconnect connect( (SenderObject*)s, a_signal.toLatin1(), (ReceiverObject*)r, a_slot.toLatin1() ); // Test disconnectNotify for a complete disconnect ((SenderObject*)s)->disconnect((ReceiverObject*)r); -#endif delete s; delete r; |