diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-08 09:50:01 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-09 09:33:53 (GMT) |
| commit | 934d4b9852060b2870f6774cd854331422147d3e (patch) | |
| tree | aa3b7efeeae6af037c410e0a47f4429523bb9d4a /tests/auto/qobject | |
| parent | d5d39f04c2c473401e9147d57d5a7c62f6111656 (diff) | |
| download | Qt-934d4b9852060b2870f6774cd854331422147d3e.zip Qt-934d4b9852060b2870f6774cd854331422147d3e.tar.gz Qt-934d4b9852060b2870f6774cd854331422147d3e.tar.bz2 | |
Use 64bit for the connectedSignals
as QML objects may have lots of signals
Do not use quint64 as it would produce lots of useless padding
on MSVC 32bit
Reviewed-by: Brad
Diffstat (limited to 'tests/auto/qobject')
| -rw-r--r-- | tests/auto/qobject/tst_qobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp index 67a9c46..a2524aa 100644 --- a/tests/auto/qobject/tst_qobject.cpp +++ b/tests/auto/qobject/tst_qobject.cpp @@ -3058,10 +3058,8 @@ void tst_QObject::isSignalConnected() QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig05()"))); QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig15()"))); QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig29()"))); - if (sizeof(void *) >= 8) { //on 32bit isSignalConnected only works with the first 32 signals - QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig60()"))); - QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()"))); - } + QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig60()"))); + QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()"))); #endif QObject::connect(&o, SIGNAL(sig00()), &o, SIGNAL(sig69())); @@ -3115,6 +3113,8 @@ void tst_QObject::isSignalConnected() QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig04()"))); QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig21()"))); QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig25()"))); + QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig55()"))); + QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()"))); #endif emit o.sig00(); |