aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/mimetypes/mimedatabase.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2016-11-14 14:28:59 +0100
committerEike Ziller <eike.ziller@qt.io>2016-11-15 11:39:12 +0000
commitfc69e4ef54bd62cff288ed5872dd006b2a4937f8 (patch)
tree900b1d264f450835f4022949880e46ed8fd2e99d /src/libs/utils/mimetypes/mimedatabase.cpp
parent53d45de8a0d5d9efacbf208f25ba75b47414838e (diff)
Fix that it was not possible to save with arbitrary file extension
On Windows. Task-number: QTCREATORBUG-15862 Change-Id: I5cc76662e4996bfa26eece09f2e30dc3ce873eb5 Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/libs/utils/mimetypes/mimedatabase.cpp')
-rw-r--r--src/libs/utils/mimetypes/mimedatabase.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/libs/utils/mimetypes/mimedatabase.cpp b/src/libs/utils/mimetypes/mimedatabase.cpp
index 8f36b241c83..bfb461b4028 100644
--- a/src/libs/utils/mimetypes/mimedatabase.cpp
+++ b/src/libs/utils/mimetypes/mimedatabase.cpp
@@ -59,7 +59,11 @@
#include <algorithm>
#include <functional>
-static const char ALL_FILES_FILTER[] = QT_TRANSLATE_NOOP("Core", "All Files (*)");
+#ifdef Q_OS_WIN
+static struct {const char *source; const char *comment; } ALL_FILES_FILTER = QT_TRANSLATE_NOOP3("Core", "All Files (*.*)", "On Windows");
+#else
+static struct {const char *source; const char *comment; } ALL_FILES_FILTER = QT_TRANSLATE_NOOP3("Core", "All Files (*)", "On Linux/macOS");
+#endif
using namespace Utils;
using namespace Utils::Internal;
@@ -348,8 +352,7 @@ QString MimeDatabase::allFiltersString(QString *allFilesFilter)
foreach (const QString &filter, uniqueFilters)
filters.append(filter);
filters.sort();
- static const QString allFiles =
- QCoreApplication::translate("Core", ALL_FILES_FILTER);
+ const QString allFiles = allFilesFilterString();
if (allFilesFilter)
*allFilesFilter = allFiles;
@@ -359,6 +362,11 @@ QString MimeDatabase::allFiltersString(QString *allFilesFilter)
return filters.join(QLatin1String(";;"));
}
+QString MimeDatabase::allFilesFilterString()
+{
+ return QCoreApplication::translate("Core", ALL_FILES_FILTER.source, ALL_FILES_FILTER.comment);
+}
+
QStringList MimeDatabase::allGlobPatterns()
{
MimeDatabase mdb;