diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-24 15:01:28 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-27 16:03:56 +0200 |
| commit | 3b8a32a486dd21064dda71677d50f2b3e6c53cf9 (patch) | |
| tree | d55131113716a9ad0addeda8b3f4a132d4967a94 | |
| parent | f94b64cb4e4f8ffe316272cd39789ba4c7d220e7 (diff) | |
| download | qtlocation-3b8a32a486dd21064dda71677d50f2b3e6c53cf9.tar.gz | |
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 <alexander.blasche@qt.io>
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp | 4 |
1 files 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(); } |