mirror of
https://github.com/danog/patches.git
synced 2024-11-29 20:09:09 +01:00
2b9afa7592
Backport support for opening directories with xdg desktop portals Backport fix for ibus on wayland
31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
|
|
index 9de3268fc8..8b281c95db 100644
|
|
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
|
|
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
|
|
@@ -1179,7 +1179,14 @@ void QWindowsNativeFileDialogBase::selectFile(const QString &fileName) const
|
|
// Hack to prevent CLSIDs from being set as file name due to
|
|
// QFileDialogPrivate::initialSelection() being QString-based.
|
|
if (!isClsid(fileName))
|
|
- m_fileDialog->SetFileName((wchar_t*)fileName.utf16());
|
|
+ // Patch: Fix handle of full fileName.
|
|
+ {
|
|
+ QString file = QDir::toNativeSeparators(fileName);
|
|
+ int lastBackSlash = file.lastIndexOf(QChar::fromLatin1('\\'));
|
|
+ if (lastBackSlash >= 0)
|
|
+ file = file.mid(lastBackSlash + 1);
|
|
+ m_fileDialog->SetFileName((wchar_t*)file.utf16());;
|
|
+ }
|
|
}
|
|
|
|
// Return the index of the selected filter, accounting for QFileDialog
|
|
@@ -1456,7 +1463,8 @@ static QString createTemporaryItemCopy(QWindowsShellItem &qItem, QString *errorM
|
|
static QUrl itemToDialogUrl(QWindowsShellItem &qItem, QString *errorMessage)
|
|
{
|
|
QUrl url = qItem.url();
|
|
- if (url.isLocalFile() || url.scheme().startsWith(QLatin1String("http")))
|
|
+ // Patch: Make loaded 'http' resources copy.
|
|
+ if (url.isLocalFile()/*|| url.scheme().startsWith(QLatin1String("http"))*/)
|
|
return url;
|
|
const QString path = qItem.path();
|
|
if (path.isEmpty() && !qItem.isDir() && qItem.canStream()) {
|