1*4882a593SmuzhiyunFrom 9b045ee7988daf3bb4c7cbe1ed1b9d744820e82b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Pierre Le Magourou <pierre.lemagourou@openwide.fr> 3*4882a593SmuzhiyunDate: Mon, 15 Dec 2014 11:54:51 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Fix execution problem with Qt5.3. 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis patch has been inspired from Open Embedded meta-qt5. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Pierre Le Magourou <pierre.lemagourou@openwide.fr> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun content/SettingsView.qml | 4 ++-- 11*4882a593Smuzhiyun content/Switch.qml | 8 ++++---- 12*4882a593Smuzhiyun 2 files changed, 6 insertions(+), 6 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/content/SettingsView.qml b/content/SettingsView.qml 15*4882a593Smuzhiyunindex 7944803..a0ddcc8 100644 16*4882a593Smuzhiyun--- a/content/SettingsView.qml 17*4882a593Smuzhiyun+++ b/content/SettingsView.qml 18*4882a593Smuzhiyun@@ -127,8 +127,8 @@ Item { 19*4882a593Smuzhiyun Switch { 20*4882a593Smuzhiyun text: "Do you l-o-v-e colors?" 21*4882a593Smuzhiyun checked: settings.showColors 22*4882a593Smuzhiyun- onText: "Yes" 23*4882a593Smuzhiyun- offText: "No!" 24*4882a593Smuzhiyun+ textON: "Yes" 25*4882a593Smuzhiyun+ textOFF: "No!" 26*4882a593Smuzhiyun onCheckedChanged: { 27*4882a593Smuzhiyun settings.showColors = checked; 28*4882a593Smuzhiyun } 29*4882a593Smuzhiyundiff --git a/content/Switch.qml b/content/Switch.qml 30*4882a593Smuzhiyunindex 967c03f..66955fc 100644 31*4882a593Smuzhiyun--- a/content/Switch.qml 32*4882a593Smuzhiyun+++ b/content/Switch.qml 33*4882a593Smuzhiyun@@ -6,8 +6,8 @@ Item { 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun property alias text: textItem.text 36*4882a593Smuzhiyun property bool checked: false 37*4882a593Smuzhiyun- property string onText: "On" 38*4882a593Smuzhiyun- property string offText: "Off" 39*4882a593Smuzhiyun+ property string textON: "On" 40*4882a593Smuzhiyun+ property string textOFF: "Off" 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun QtObject { 43*4882a593Smuzhiyun id: priv 44*4882a593Smuzhiyun@@ -120,7 +120,7 @@ Item { 45*4882a593Smuzhiyun color: "#000000" 46*4882a593Smuzhiyun font.pixelSize: 18 47*4882a593Smuzhiyun font.bold: true 48*4882a593Smuzhiyun- text: onText 49*4882a593Smuzhiyun+ text: textON 50*4882a593Smuzhiyun } 51*4882a593Smuzhiyun Text { 52*4882a593Smuzhiyun anchors.verticalCenter: parent.verticalCenter 53*4882a593Smuzhiyun@@ -129,7 +129,7 @@ Item { 54*4882a593Smuzhiyun color: "#ffffff" 55*4882a593Smuzhiyun font.pixelSize: 18 56*4882a593Smuzhiyun font.bold: true 57*4882a593Smuzhiyun- text: offText 58*4882a593Smuzhiyun+ text: textOFF 59*4882a593Smuzhiyun } 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun Image { 62*4882a593Smuzhiyun-- 63*4882a593Smuzhiyun2.1.3 64*4882a593Smuzhiyun 65