Update the bindable properties example

- Fix the number of months in each duration
- Move the user Country enum to use QLocale::Territory
- Properly calculate the cost per month to match the UI label
- Use QLocale to format the price display text
- Fix some misspellings and grammar in the doc

Pick-to: 6.2 6.5
Change-Id: I78a64f344073070cd94d5cb4a8a4c7c13afa337f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/examples/corelib/bindableproperties/bindablesubscription/main.cpp b/examples/corelib/bindableproperties/bindablesubscription/main.cpp
index c861f8af4c..6cf73c1337 100644
--- a/examples/corelib/bindableproperties/bindablesubscription/main.cpp
+++ b/examples/corelib/bindableproperties/bindablesubscription/main.cpp
@@ -37,15 +37,15 @@ int main(int argc, char *argv[])
     // Initialize user data
     QPushButton *germany = w.findChild<QPushButton *>("btnGermany");
     QObject::connect(germany, &QPushButton::clicked, [&] {
-        user.setCountry(BindableUser::Germany);
+        user.setCountry(BindableUser::Country::Germany);
     });
     QPushButton *finland = w.findChild<QPushButton *>("btnFinland");
     QObject::connect(finland, &QPushButton::clicked, [&] {
-        user.setCountry(BindableUser::Finland);
+        user.setCountry(BindableUser::Country::Finland);
     });
     QPushButton *norway = w.findChild<QPushButton *>("btnNorway");
     QObject::connect(norway, &QPushButton::clicked, [&] {
-        user.setCountry(BindableUser::Norway);
+        user.setCountry(BindableUser::Country::Norway);
     });
 
     QSpinBox *ageSpinBox = w.findChild<QSpinBox *>("ageSpinBox");
@@ -58,7 +58,8 @@ int main(int argc, char *argv[])
     // Track price changes
 //! [update-ui]
     auto priceChangeHandler = subscription.bindablePrice().subscribe([&] {
-        priceDisplay->setText(QString::number(subscription.price()));
+        QLocale lc{QLocale::AnyLanguage, user.country()};
+        priceDisplay->setText(lc.toCurrencyString(subscription.price() / subscription.duration()));
     });
 
     auto priceValidHandler = subscription.bindableIsValid().subscribe([&] {