diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-04-29 16:21:55 +0200 |
---|---|---|
committer | Andy Nichols <andy.nichols@digia.com> | 2014-04-29 17:42:10 +0300 |
commit | ec601d35edd2a3fcc0553db983bdd2a4f4439cdf (patch) | |
tree | 4733cf488ed39cc779159395982d7e335111751e /basicsuite | |
parent | cd70f5f95a804370e4da300c134cf615ce60fb46 (diff) |
Fix qt5-cinematicdemo on Qt 5.3
onText is treated as a signal name
Task-number: QTEE-500
Change-Id: I78a5c7ade640da5a7884dc6e1741c216061e3717
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'basicsuite')
-rw-r--r-- | basicsuite/qt5-cinematicdemo/content/SettingsView.qml | 4 | ||||
-rw-r--r-- | basicsuite/qt5-cinematicdemo/content/Switch.qml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/basicsuite/qt5-cinematicdemo/content/SettingsView.qml b/basicsuite/qt5-cinematicdemo/content/SettingsView.qml index 7944803..4499a8c 100644 --- a/basicsuite/qt5-cinematicdemo/content/SettingsView.qml +++ b/basicsuite/qt5-cinematicdemo/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/basicsuite/qt5-cinematicdemo/content/Switch.qml b/basicsuite/qt5-cinematicdemo/content/Switch.qml index 967c03f..0124658 100644 --- a/basicsuite/qt5-cinematicdemo/content/Switch.qml +++ b/basicsuite/qt5-cinematicdemo/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 { |