whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows QPA/File dialog: Pass up http[s] URLs 

The native Windows allows for typing in http[s] URLs directly (without
checking existence). Pass these up.

Fixes: QTBUG-71785
Change-Id: I60237bab596ca3f52e6f513f17544ff94e9080da
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
bb10
Friedemann Kleint 2019-04-03 15:35:30 +02:00
parent 448177d857
commit 8045ccc382
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
View File

@ -1453,26 +1453,41 @@ static QString createTemporaryItemCopy(QWindowsShellItem &qItem, QString *errorM
return result;
}
static QUrl itemToDialogUrl(QWindowsShellItem &qItem, QString *errorMessage)
{
QUrl url = qItem.url();
if (url.isLocalFile() || url.scheme().startsWith(QLatin1String("http")))
return url;
const QString path = qItem.path();
if (path.isEmpty() && !qItem.isDir() && qItem.canStream()) {
const QString temporaryCopy = createTemporaryItemCopy(qItem, errorMessage);
if (temporaryCopy.isEmpty()) {
QDebug(errorMessage).noquote() << "Unable to create a local copy of"
<< qItem << ": " << errorMessage;
return QUrl();
}
return QUrl::fromLocalFile(temporaryCopy);
}
if (!url.isValid())
QDebug(errorMessage).noquote() << "Invalid URL obtained from" << qItem;
return url;
}
QList<QUrl> QWindowsNativeOpenFileDialog::dialogResult() const
{
QList<QUrl> result;
IShellItemArray *items = nullptr;
if (SUCCEEDED(openFileDialog()->GetResults(&items)) && items) {
QString errorMessage;
for (IShellItem *item : QWindowsShellItem::itemsFromItemArray(items)) {
QWindowsShellItem qItem(item);
const QString path = qItem.path();
if (path.isEmpty() && !qItem.isDir()) {
QString errorMessage;
const QString temporaryCopy = createTemporaryItemCopy(qItem, &errorMessage);
if (temporaryCopy.isEmpty()) {
qWarning().noquote() << "Unable to create a local copy of" << qItem
<< ": " << errorMessage;
} else {
result.append(QUrl::fromLocalFile(temporaryCopy));
}
} else {
result.append(qItem.url());
const QUrl url = itemToDialogUrl(qItem, &errorMessage);
if (!url.isValid()) {
qWarning("%s", qPrintable(errorMessage));
result.clear();
break;
}
result.append(url);
}
}
return result;