1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: fix uri-list handling urls

Browse Source 
We were only handling the case where uri-list was a file.
This fixes a regression.

Also - add dragging url into the clipboard manual test

Pick-to: 6.7.1
Change-Id: Ifbd087ffd157463b6b903199e3ff22c2de1c4942
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit d67d49f45ec84aba4047305825f36bbc02d3d26c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Lorn Potter 2024-05-08 14:22:00 +10:00 committed by Qt Cherry-pick Bot
parent a3e37975e1
commit fd6f9e92d8
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/wasm/qwasmdom.cpp
View File

@ -104,7 +104,10 @@ void DataTransfer::toMimeDataWithFile(std::function<void(QMimeData *)> callback)
if (--m_remainingItemCount > 0) if (--m_remainingItemCount > 0)
return; return;
mimeData->setUrls(fileUrls); QList<QUrl> allUrls;
allUrls.append(mimeData->urls());
allUrls.append(fileUrls);
mimeData->setUrls(allUrls);
m_callback(mimeData); m_callback(mimeData);
@ -201,7 +204,11 @@ void DataTransfer::toMimeDataWithFile(std::function<void(QMimeData *)> callback)
mimeContext->mimeData->setHtml(data); mimeContext->mimeData->setHtml(data);
else if (itemMimeType.isEmpty() || itemMimeType == "text/plain") else if (itemMimeType.isEmpty() || itemMimeType == "text/plain")
mimeContext->mimeData->setText(data); // the type can be empty mimeContext->mimeData->setText(data); // the type can be empty
else { else if (itemMimeType.isEmpty() || itemMimeType == "text/uri-list") {
QList<QUrl> urls;
urls.append(data);
mimeContext->mimeData->setUrls(urls);
} else {
// TODO improve encoding // TODO improve encoding
if (data.startsWith("QB64")) { if (data.startsWith("QB64")) {
data.remove(0, 4); data.remove(0, 4);

6
tests/manual/wasm/clipboard/mainwindow.cpp
View File

@ -275,7 +275,11 @@ void MainWindow::dropEvent(QDropEvent* e)
} }
ui->textEdit_2->insertPlainText(" Drop has url data length: " + sizeStr + "\n"); ui->textEdit_2->insertPlainText(" Drop has url data length: " + sizeStr + "\n");
ui->textEdit_2->insertPlainText(" " + urlStr + " sha1 " + sha1.left(8) + "\n"); if (sha1.isEmpty()) {
ui->textEdit->insertPlainText(urlStr);
}
ui->textEdit_2->insertPlainText(" " + urlStr + (!sha1.isEmpty() ? " sha1 " + sha1.left(8) : "") + "\n");
} }
ui->textEdit_2->insertPlainText("\n"); ui->textEdit_2->insertPlainText("\n");