feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Fix filter when selected is not registered

Browse Source 
Without this patch a warning will be triggered on Windows and
the selected filter is not chosen on all platforms when saving
a file, e.g. a json file.

Change-Id: Id6de0eddcac83369596f68d50494f10b70c30b15
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marcus Tillmanns
2023-05-26 14:50:16 +02:00
parent aa2e8e3cb8
commit 9719bcfd2e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -856,7 +856,7 @@ FilePath DocumentManager::getSaveFileNameWithExtension(const QString &title, con
FilePath DocumentManager::getSaveAsFileName(const IDocument *document) FilePath DocumentManager::getSaveAsFileName(const IDocument *document)
{ {
QTC_ASSERT(document, return {}); QTC_ASSERT(document, return {});
const QString filter = allDocumentFactoryFiltersString(); QString filter = allDocumentFactoryFiltersString();
const FilePath filePath = document->filePath(); const FilePath filePath = document->filePath();
QString selectedFilter; QString selectedFilter;
FilePath fileDialogPath = filePath; FilePath fileDialogPath = filePath;
@@ -876,6 +876,9 @@ FilePath DocumentManager::getSaveAsFileName(const IDocument *document)
if (selectedFilter.isEmpty()) if (selectedFilter.isEmpty())
selectedFilter = Utils::mimeTypeForName(document->mimeType()).filterString(); selectedFilter = Utils::mimeTypeForName(document->mimeType()).filterString();
if (!filter.contains(selectedFilter))
filter.prepend(selectedFilter + QLatin1String(";;"));
return getSaveFileName(Tr::tr("Save File As"), return getSaveFileName(Tr::tr("Save File As"),
fileDialogPath, fileDialogPath,
filter, filter,