summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-06 13:31:46 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-06 13:57:03 +0000
commitffb8464cefd661cfa3428931bd80ee262cacbe13 (patch)
tree03eb4a163b611cb2c8dfa8ce820f809af0f2ccd0 /src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
parentf02dde3d74ec69d2bafa25053ff85e514d950b0e (diff)
Windows: Fix trailing blank in native file dialog filter
Strip trailing blanks when not filtering by suffix. Amends 76735f3fa0fdf772aa4fba9a9aaa241415eaf922. Pick-to: 5.15 Fixes: QTBUG-85423 Task-number: QTBUG-42405 Change-Id: Ic13a4e7718f7f1935b1fc329a7beaf1d357fd44d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsdialoghelpers.cpp')
-rw-r--r--src/plugins/platforms/windows/qwindowsdialoghelpers.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index dbd7d557db..16a9110918 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -1087,8 +1087,11 @@ void QWindowsNativeFileDialogBase::setNameFilters(const QStringList &filters)
const QString &filter = specs[i].filter;
if (!m_hideFiltersDetails && !filter.startsWith(u"*.")) {
const int pos = description.lastIndexOf(u'(');
- if (pos > 0)
+ if (pos > 0) {
description.truncate(pos);
+ while (!description.isEmpty() && description.back().isSpace())
+ description.chop(1);
+ }
}
// Add to buffer.
comFilterSpec[i].pszName = ptr;