aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols2/qquickstyle.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-05-23 15:18:14 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-06-07 09:41:44 +0000
commita4a570e813c72e308dd0897bcf256d19fee471a3 (patch)
treeebd5a11a6fba9b82222a188cbecbb8db16700b71 /src/quickcontrols2/qquickstyle.cpp
parentdcf711bdce97778874e6a9bb59b00a0b7d9d84a0 (diff)
Fix QQuickStyle::availableStyles()
Filter out macOS debug symbol (.dSYM) directories from the list of available styles. Task-number: QTBUG-60973 Change-Id: I5b9c3f4af946d44b1601f32bf7da699c29a86689 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickcontrols2/qquickstyle.cpp')
-rw-r--r--src/quickcontrols2/qquickstyle.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index 184cbfc7..80ed5ea9 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -392,9 +392,12 @@ QStringList QQuickStyle::availableStyles()
const QStringList stylePaths = QQuickStylePrivate::stylePaths();
for (const QString &path : stylePaths) {
- QDir dir(path);
- styles += dir.entryList(QStringList(), QDir::Dirs | QDir::NoDotAndDotDot);
- styles.removeAll(QStringLiteral("designer"));
+ const QList<QFileInfo> entries = QDir(path).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+ for (const QFileInfo &entry : entries) {
+ const QString name = entry.fileName();
+ if (!name.endsWith(QLatin1String(".dSYM")) && name != QLatin1String("designer"))
+ styles += name;
+ }
}
styles.prepend(QStringLiteral("Default"));
styles.removeDuplicates();