Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Compile when USER_TIMER_MINIMUM isn't defined
  Docs: QTBUG-10866 Description of how AutoConnection is resolved.
  Fix compilation with Sun Studio 12.1.
  Compile with QT_NO_PROXYSCREEN.
  silence compiler warnings
  Don't let posted events starve native dialogs (regression)

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());