Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public

Conflicts:
	mkspecs/features/symbian/platform_paths.prf

1 files changed, 2 insertions, 4 deletions

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index d7088ff..ce3e1a0 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -619,10 +619,8 @@ bool QDBusConnection::connect(const QString &service, const QString &path, const
     if (interface.isEmpty() && name.isEmpty())
         return false;
 
-    QString owner = d->getNameOwner(service); // we don't care if the owner is empty
-                                              // it might get started later
     QDBusWriteLocker locker(ConnectAction, d);
-    return d->connectSignal(service, owner, path, interface, name, argumentMatch, signature, receiver, slot);
+    return d->connectSignal(service, path, interface, name, argumentMatch, signature, receiver, slot);
 }
 
 /*!