Merge pull request #85 from fbeutel/master

File transfer: Make sure the filename is being converted to a QUrl correctly

2 files changed, 2 insertions, 1 deletions

diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index e32aded7..6fb2da75 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -1331,7 +1331,7 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, const QStri
 
     // create job
     QXmppTransferJob *job = sendFile(jid, device, fileInfo);
-    job->setLocalFileUrl(filePath);
+    job->setLocalFileUrl(QUrl::fromLocalFile(filePath));
     return job;
 }
 
diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
index 9ca0adcf..745acebb 100644
--- a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
+++ b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
@@ -148,6 +148,7 @@ void tst_QXmppTransferManager::testSendFile()
     QEventLoop loop;
     QXmppTransferJob *senderJob = senderManager->sendFile("receiver@localhost/QXmpp", ":/test.svg");
     QVERIFY(senderJob);
+    QCOMPARE(senderJob->localFileUrl(), QUrl::fromLocalFile(":/test.svg"));
     connect(senderJob, SIGNAL(finished()), &loop, SLOT(quit()));
     loop.exec();