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, 3 insertions, 3 deletions

diff --git a/examples/corelib/bindableproperties/subscription/subscription.cpp b/examples/corelib/bindableproperties/subscription/subscription.cpp
index 16bb6cfdd6..5d040f76d9 100644
--- a/examples/corelib/bindableproperties/subscription/subscription.cpp
+++ b/examples/corelib/bindableproperties/subscription/subscription.cpp
@@ -57,10 +57,10 @@ double Subscription::calculateDiscount() const
 
 int Subscription::basePrice() const
 {
-    if (m_user->country() == User::None)
+    if (m_user->country() == User::Country::AnyTerritory)
         return 0;
 
-    return (m_user->country() == User::Norway) ? 100 : 80;
+    return (m_user->country() == User::Country::Norway) ? 100 : 80;
 }
 
 //! [calculate-base-price]
@@ -70,7 +70,7 @@ int Subscription::basePrice() const
 void Subscription::updateValidity()
 {
     bool isValid = m_isValid;
-    m_isValid = m_user->country() != User::None && m_user->age() > 12;
+    m_isValid = m_user->country() != User::Country::AnyTerritory && m_user->age() > 12;
 
     if (m_isValid != isValid)
         emit isValidChanged();