From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 27 May 2011 03:39:15 +0000 (+1000)
Subject: Some fixes for tests/auto/declarative/examples autotest
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=850042800949ed498ccfe711d84e1de1321fd5fd;p=konrad%2Fqtdeclarative.git

Some fixes for tests/auto/declarative/examples autotest

Change-Id: I58b4c52c64fc51863f14f50e077c975928e71ebb
---

diff --git a/doc/src/snippets/declarative/codingconventions/myscript.js b/doc/src/snippets/declarative/codingconventions/myscript.js
new file mode 100644
index 0000000..cfa6462
--- /dev/null
+++ b/doc/src/snippets/declarative/codingconventions/myscript.js
@@ -0,0 +1,9 @@
+function calculateWidth(parent)
+{
+    var w = parent.width / 3
+    // ...
+    // more javascript code
+    // ...
+    console.debug(w)
+    return w
+}
diff --git a/doc/src/snippets/declarative/focus/myclickablewidget.qml b/doc/src/snippets/declarative/focus/MyClickableWidget.qml
similarity index 100%
rename from doc/src/snippets/declarative/focus/myclickablewidget.qml
rename to doc/src/snippets/declarative/focus/MyClickableWidget.qml
diff --git a/doc/src/snippets/declarative/focus/mywidget.qml b/doc/src/snippets/declarative/focus/MyWidget.qml
similarity index 100%
copy from doc/src/snippets/declarative/focus/mywidget.qml
copy to doc/src/snippets/declarative/focus/MyWidget.qml
diff --git a/doc/src/snippets/declarative/focus/mywidget.qml b/doc/src/snippets/declarative/righttoleft/Child.qml
similarity index 81%
rename from doc/src/snippets/declarative/focus/mywidget.qml
rename to doc/src/snippets/declarative/righttoleft/Child.qml
index 0cca747..48cb295 100644
--- a/doc/src/snippets/declarative/focus/mywidget.qml
+++ b/doc/src/snippets/declarative/righttoleft/Child.qml
@@ -37,22 +37,15 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-//! [document]
+
 import QtQuick 1.0
 
-//! [mywidget]
 Rectangle {
-    id: widget
-    color: "lightsteelblue"; width: 175; height: 25; radius: 10; smooth: true
-    Text { id: label; anchors.centerIn: parent}
-    focus: true
-    Keys.onPressed: {
-        if (event.key == Qt.Key_A)
-            label.text = 'Key A was pressed'
-        else if (event.key == Qt.Key_B)
-            label.text = 'Key B was pressed'
-        else if (event.key == Qt.Key_C)
-            label.text = 'Key C was pressed'
+    width: 50; height: 50
+    color: "black"
+    Text {
+        color: "white"
+        text: String.fromCharCode(65 + Math.floor(26*Math.random()))
+        anchors.centerIn: parent
     }
 }
-//! [mywidget]