diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-09-13 13:50:40 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-09-13 14:03:52 (GMT) |
| commit | 5d9fb4b86ffd604e65ade61a252037dca224af53 (patch) | |
| tree | b891096134180c5bf5eb512b09b69158e2a876fc /tests/auto/qobject | |
| parent | 548155fec3a8b575215625d4fd767e63c20f6b84 (diff) | |
| download | Qt-5d9fb4b86ffd604e65ade61a252037dca224af53.zip Qt-5d9fb4b86ffd604e65ade61a252037dca224af53.tar.gz Qt-5d9fb4b86ffd604e65ade61a252037dca224af53.tar.bz2 | |
tests: fix compilation with suncc
Patch derived from the tasks
Task-number: QTBUG-12997
Task-number: QTBUG-12984
Task-number: QTBUG-12985
Task-number: QTBUG-12990
Task-number: QTBUG-12999
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 08b7c19..5f6262e 100644 --- a/tests/auto/qobject/tst_qobject.cpp +++ b/tests/auto/qobject/tst_qobject.cpp @@ -3243,16 +3243,16 @@ void tst_QObject::overloads() QCOMPARE(obj2.s_num, 101); emit obj1.sig(&obj2, &obj3); //this signal is connected QCOMPARE(obj1.s_num, 11); - QCOMPARE(obj1.o1_obj, &obj2); + QCOMPARE(obj1.o1_obj, (QObject *)&obj2); QCOMPARE(obj1.o2_obj, &obj3); QCOMPARE(obj1.o3_obj, (QObject *)0); //default arg of the signal - QCOMPARE(obj1.o4_obj, qApp); //default arg of the slot + QCOMPARE(obj1.o4_obj, (QObject *)qApp); //default arg of the slot QCOMPARE(obj2.s_num, 111); - QCOMPARE(obj2.o1_obj, &obj2); + QCOMPARE(obj2.o1_obj, (QObject *)&obj2); QCOMPARE(obj2.o2_obj, &obj3); QCOMPARE(obj2.o3_obj, (QObject *)0); //default arg of the signal - QCOMPARE(obj2.o4_obj, qApp); //default arg of the slot + QCOMPARE(obj2.o4_obj, (QObject *)qApp); //default arg of the slot } class ManySignals : public QObject |