diff options
author | Lorn Potter <lorn.potter@gmail.com> | 2024-05-08 14:22:00 +1000 |
---|---|---|
committer | Lorn Potter <lorn.potter@gmail.com> | 2024-05-29 08:18:06 +1000 |
commit | d67d49f45ec84aba4047305825f36bbc02d3d26c (patch) | |
tree | 7bdd1514ab0d0eebc9189ebb92f623a412660bac /src/plugins/platforms/wasm/qwasmdom.cpp | |
parent | 3073b9c4dec5e5877363794bf81cbd4b84fdb9ee (diff) |
wasm: fix uri-list handling urls
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 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>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmdom.cpp')
-rw-r--r-- | src/plugins/platforms/wasm/qwasmdom.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/plugins/platforms/wasm/qwasmdom.cpp b/src/plugins/platforms/wasm/qwasmdom.cpp index 6b2b3d09336..96790ca71f3 100644 --- a/src/plugins/platforms/wasm/qwasmdom.cpp +++ b/src/plugins/platforms/wasm/qwasmdom.cpp @@ -104,7 +104,10 @@ void DataTransfer::toMimeDataWithFile(std::function<void(QMimeData *)> callback) if (--m_remainingItemCount > 0) return; - mimeData->setUrls(fileUrls); + QList<QUrl> allUrls; + allUrls.append(mimeData->urls()); + allUrls.append(fileUrls); + mimeData->setUrls(allUrls); m_callback(mimeData); @@ -201,7 +204,11 @@ void DataTransfer::toMimeDataWithFile(std::function<void(QMimeData *)> callback) mimeContext->mimeData->setHtml(data); else if (itemMimeType.isEmpty() || itemMimeType == "text/plain") 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 if (data.startsWith("QB64")) { data.remove(0, 4); |