From c4f27aeb5cb3798c4dd95aa19d5cb166a602dd76 Mon Sep 17 00:00:00 2001 From: fbeutel Date: Wed, 21 Oct 2015 17:02:03 +0200 Subject: File transfer: Make sure the filename is being converted to a QUrl correctly --- src/client/QXmppTransferManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.2.3 From 91714639c17b0027a1fda949f4b7f092fb6b1055 Mon Sep 17 00:00:00 2001 From: fbeutel Date: Wed, 21 Oct 2015 19:50:14 +0200 Subject: Added test case for c4f27ae (converting file transfer path correctly) --- tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp index 9ca0adcf..10fd8d89 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().toLocalFile(), QString(":/test.svg")); connect(senderJob, SIGNAL(finished()), &loop, SLOT(quit())); loop.exec(); -- cgit v1.2.3 From a9f8301756bbe616e8c1c4d205adc85b40b14fe7 Mon Sep 17 00:00:00 2001 From: fbeutel Date: Wed, 21 Oct 2015 22:46:53 +0200 Subject: Change test case for c4f27ae, compare localFileUrl directly --- tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp index 10fd8d89..745acebb 100644 --- a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp +++ b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp @@ -148,7 +148,7 @@ void tst_QXmppTransferManager::testSendFile() QEventLoop loop; QXmppTransferJob *senderJob = senderManager->sendFile("receiver@localhost/QXmpp", ":/test.svg"); QVERIFY(senderJob); - QCOMPARE(senderJob->localFileUrl().toLocalFile(), QString(":/test.svg")); + QCOMPARE(senderJob->localFileUrl(), QUrl::fromLocalFile(":/test.svg")); connect(senderJob, SIGNAL(finished()), &loop, SLOT(quit())); loop.exec(); -- cgit v1.2.3