diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-21 15:26:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-21 15:26:18 +0100 |
| commit | fb9cff6e88699b57b5dbc05d79c7958a2deacd71 (patch) | |
| tree | b0dbd28d8c36eabf4eab750e68ac2e7cf886e1e5 /src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | |
| parent | da2f627ba2117b6ef1791ff8971df2fc68c29d10 (diff) | |
| parent | 2ab9b747fcc5aa50e8cca758f7780158e734a222 (diff) | |
Merge "Merge remote-tracking branch 'gerrit/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsdialoghelpers.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 5cc5230832..8565bf0204 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -1340,7 +1340,9 @@ static inline QString appendSuffix(const QString &fileName, const QString &filte if (suffixPos < 0) return fileName; suffixPos += 3; - int endPos = filter.indexOf(QLatin1Char(';'), suffixPos + 1); + int endPos = filter.indexOf(QLatin1Char(' '), suffixPos + 1); + if (endPos < 0) + endPos = filter.indexOf(QLatin1Char(';'), suffixPos + 1); if (endPos < 0) endPos = filter.indexOf(QLatin1Char(')'), suffixPos + 1); if (endPos < 0) |