summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-11-19 12:29:04 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-11-19 12:30:25 (GMT)
commiteaa0529642c90de3ebc07d819c0c0e8ed96a79be (patch)
treedcd56cbdcd7e37b4794695888383a66d5f474653 /tests
parent4e9b721af573e7d1a16b35778059b374520cf055 (diff)
downloadQt-eaa0529642c90de3ebc07d819c0c0e8ed96a79be.zip
Qt-eaa0529642c90de3ebc07d819c0c0e8ed96a79be.tar.gz
Qt-eaa0529642c90de3ebc07d819c0c0e8ed96a79be.tar.bz2
Fix compilation with Sun Studio 12.1.
Error was: "tst_qdbusconnection.cpp", line 301: Error: Could not find a match for QTest::qCompare<QTest::T>(QObject*, MyObject*, const char[29], const char[5], const char[24], int) needed in tst_QDBusConnection::registerObject(). "tst_qdbusconnection.cpp", line 498: Error: Could not find a match for QTest::qCompare<QTest::T>(QObject*, TestObject*, const char[39], const char[12], const char[24], int) needed in tst_QDBusConnection::callSelf(). Task-number: QTBUG-15324 Patch-by: Pavel Heimlich Reviewed-by: Thiago Macieira
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qdbusconnection/tst_qdbusconnection.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
index 96209b1..599abbd 100644
--- a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
+++ b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
@@ -298,7 +298,7 @@ void tst_QDBusConnection::registerObject()
// register one object at root:
MyObject obj;
QVERIFY(con.registerObject(path, &obj, QDBusConnection::ExportAllSlots));
- QCOMPARE(con.objectRegisteredAt(path), &obj);
+ QCOMPARE(con.objectRegisteredAt(path), static_cast<QObject *>(&obj));
QVERIFY(callMethod(con, path));
QCOMPARE(obj.path, path);
}
@@ -495,7 +495,7 @@ void tst_QDBusConnection::callSelf()
QDBusConnection connection = QDBusConnection::sessionBus();
QVERIFY(connection.registerObject("/test", &testObject,
QDBusConnection::ExportAllContents));
- QCOMPARE(connection.objectRegisteredAt("/test"), &testObject);
+ QCOMPARE(connection.objectRegisteredAt("/test"), static_cast<QObject *>(&testObject));
QVERIFY(connection.registerService(serviceName()));
QDBusInterface interface(serviceName(), "/test");
QVERIFY(interface.isValid());