summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/declarative/codingconventions/javascript.qml
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-10-04 06:17:13 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-10-04 06:17:13 (GMT)
commit723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b (patch)
tree4ddef15ac99c9a4babd23986c4f93eaa2009e512 /doc/src/snippets/declarative/codingconventions/javascript.qml
parentc86449e2e45b67662b652d58e95e0ca7c99782fd (diff)
parent9d0317c91dbbe660af2ed2aa8ea47446049467d2 (diff)
downloadQt-723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b.zip
Qt-723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b.tar.gz
Qt-723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b.tar.bz2
Merge branch '4.7' into mimir
Diffstat (limited to 'doc/src/snippets/declarative/codingconventions/javascript.qml')
-rw-r--r--doc/src/snippets/declarative/codingconventions/javascript.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/declarative/codingconventions/javascript.qml b/doc/src/snippets/declarative/codingconventions/javascript.qml
index 90790b9..6c94626 100644
--- a/doc/src/snippets/declarative/codingconventions/javascript.qml
+++ b/doc/src/snippets/declarative/codingconventions/javascript.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
Rectangle {