Merge commit 'refs/merge-requests/3' of git://gitorious.org/meego-handset-ux/bluetooth-qt

diff --git a/bluetooth-qt/bluetoothdevicemodel.cpp b/bluetooth-qt/bluetoothdevicemodel.cpp
index 670e7c2..4fdd2b4 100644 (file)
--- a/bluetooth-qt/bluetoothdevicemodel.cpp
+++ b/bluetooth-qt/bluetoothdevicemodel.cpp
@@ -138,7 +138,7 @@ void BluetoothDevicesModel::setDiscoverableTimeout(int timeout)
 {
        if(adapter)
        {
-               QDBusReply<void> reply = adapter->SetProperty("DiscoverableTimeout", QDBusVariant(timeout));
+               QDBusReply<void> reply = adapter->SetProperty("DiscoverableTimeout", QDBusVariant((uint)timeout));
                if(!reply.isValid())
                {
                        qDebug()<<"error setting discoverable timeout: "<<reply.error().message();