From a3436de81a16128687d9e2f56e66ab196672585b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 17 Mar 2016 09:01:08 +0100 Subject: QQuickStyleSelector::select() takes a file _name_ Don't hard-code "/" in qtlabscontrolsplugin.cpp, because it won't work with the upcoming style path configuration via QQuickStyle . Change-Id: I32c178361f16c449f81abbb34d7b3ee7daf01fce Reviewed-by: Mitch Curtis --- src/controls/qquickstyleselector.cpp | 4 ++-- src/controls/qquickstyleselector_p.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/controls') diff --git a/src/controls/qquickstyleselector.cpp b/src/controls/qquickstyleselector.cpp index 500afdd6..792812cf 100644 --- a/src/controls/qquickstyleselector.cpp +++ b/src/controls/qquickstyleselector.cpp @@ -82,10 +82,10 @@ static bool isLocalScheme(const QString &file) return local; } -QString QQuickStyleSelector::select(const QString &filePath) const +QString QQuickStyleSelector::select(const QString &fileName) const { Q_D(const QQuickStyleSelector); - QUrl url(d->baseUrl.toString() + filePath); + QUrl url(d->baseUrl.toString() + QLatin1Char('/') + fileName); if (isLocalScheme(url.scheme()) || url.isLocalFile()) { if (isLocalScheme(url.scheme())) { QString equivalentPath = QLatin1Char(':') + url.path(); diff --git a/src/controls/qquickstyleselector_p.h b/src/controls/qquickstyleselector_p.h index b68d221e..d972dd95 100644 --- a/src/controls/qquickstyleselector_p.h +++ b/src/controls/qquickstyleselector_p.h @@ -60,7 +60,7 @@ public: explicit QQuickStyleSelector(); ~QQuickStyleSelector(); - QString select(const QString &filePath) const; + QString select(const QString &fileName) const; QString style() const; void setStyle(const QString &s); -- cgit v1.2.3