From 3b8a32a486dd21064dda71677d50f2b3e6c53cf9 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 24 Jul 2020 15:01:28 +0200 Subject: Adapt to QLocale(QString) now being explicit Various things passed a string to a function expecting a locale. That no longer works; the QLocale() wrapping must be overtly present. Change-Id: Ide5ede5237d8fd4badab7d6a919b08c1883c809a Reviewed-by: Alex Blasche --- src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp index 483a5992..c1e3c81c 100644 --- a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp +++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp @@ -147,7 +147,7 @@ void QDeclarativeGeoServiceProvider::tryAttach() sharedProvider_ = new QGeoServiceProvider(name_, parameterMap()); sharedProvider_->setQmlEngine(qmlEngine(this)); - sharedProvider_->setLocale(locales_.at(0)); + sharedProvider_->setLocale(QLocale(locales_.at(0))); sharedProvider_->setAllowExperimental(experimental_); emit attached(); @@ -592,7 +592,7 @@ void QDeclarativeGeoServiceProvider::setLocales(const QStringList &locales) locales_.append(QLocale().name()); if (sharedProvider_) - sharedProvider_->setLocale(locales_.at(0)); + sharedProvider_->setLocale(QLocale(locales_.at(0))); emit localesChanged(); } -- cgit v1.2.1