diff options
-rw-r--r-- | src/quickcontrols2/qquickstyleselector.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quickcontrols2/qquickstyleselector.cpp b/src/quickcontrols2/qquickstyleselector.cpp index e20096c9..6d04c190 100644 --- a/src/quickcontrols2/qquickstyleselector.cpp +++ b/src/quickcontrols2/qquickstyleselector.cpp @@ -69,7 +69,9 @@ static QStringList allSelectors(const QString &style = QString()) { static const QStringList platformSelectors = QFileSelectorPrivate::platformSelectors(); QStringList selectors = platformSelectors; - selectors += QLocale().name(); + const QString locale = QLocale().name(); + if (!locale.isEmpty()) + selectors += locale; if (!style.isEmpty()) selectors.prepend(style); return selectors; @@ -161,7 +163,7 @@ QString QQuickStyleSelector::select(const QString &fileName) const } else if (url.isLocalFile()) { url = QUrl::fromLocalFile(d->select(url.toLocalFile())); } - return url.toString(); + return url.toString(QUrl::NormalizePathSegments); } QT_END_NAMESPACE |