fix: port to qt 5.2.95+rc1

Change-Id: Iac14cb5ce809355e13a435447c9ce90909e769d2
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

diff --git a/content/SettingsView.qml b/content/SettingsView.qml
index 794480339d38030b2356fcb3977cce6a24e6d140..4499a8ced4eb253a2710ea2eba0975d415d04e86 100644 (file)
--- a/content/SettingsView.qml
+++ b/content/SettingsView.qml
@@ -127,8 +127,8 @@ Item {
             Switch {
                 text: "Do you l-o-v-e colors?"
                 checked: settings.showColors
-                onText: "Yes"
-                offText: "No!"
+                textOn: "Yes"
+                textOff: "No!"
                 onCheckedChanged: {
                     settings.showColors = checked;
                 }

diff --git a/content/Switch.qml b/content/Switch.qml
index 967c03f5c6a83e54b4979552adea05b9c8196f0e..0124658d19383721a383dadc38aac05d0b002500 100644 (file)
--- a/content/Switch.qml
+++ b/content/Switch.qml
@@ -6,8 +6,8 @@ Item {
 
     property alias text: textItem.text
     property bool checked: false
-    property string onText: "On"
-    property string offText: "Off"
+    property string textOn: "On"
+    property string textOff: "Off"
 
     QtObject {
         id: priv
@@ -120,7 +120,7 @@ Item {
             color: "#000000"
             font.pixelSize: 18
             font.bold: true
-            text: onText
+            text: textOn
         }
         Text {
             anchors.verticalCenter: parent.verticalCenter
@@ -129,7 +129,7 @@ Item {
             color: "#ffffff"
             font.pixelSize: 18
             font.bold: true
-            text: offText
+            text: textOff
         }
 
         Image {