Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
	src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
	src/quicktemplates2/qquickapplicationwindow.cpp
	src/quicktemplates2/qquickmenu.cpp
	src/quicktemplates2/qquickmenu_p.h
	src/quicktemplates2/qquickpopup.cpp
	tests/auto/auto.pro

Change-Id: I856a022d38abd84763127539f46ef032ddc53c3d

1 files changed, 6 insertions, 3 deletions

diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index f154f0ce..48d1dc17 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -428,9 +428,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();