summaryrefslogtreecommitdiffstats
path: root/examples/declarative/tutorials/helloworld/Cell.qml
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-30 12:13:05 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-30 12:13:05 (GMT)
commitdb0c012d3eb5c5e30b0a932c5301cc03d43ba2ce (patch)
treec6e4311160a204120ed029592c97ad8094508e34 /examples/declarative/tutorials/helloworld/Cell.qml
parent19a57f4e192267523fb815246b347bbc2054b736 (diff)
parent39d908a2e1bdbb25e23e75bb5a5c4fdeec0692c0 (diff)
downloadQt-db0c012d3eb5c5e30b0a932c5301cc03d43ba2ce.zip
Qt-db0c012d3eb5c5e30b0a932c5301cc03d43ba2ce.tar.gz
Qt-db0c012d3eb5c5e30b0a932c5301cc03d43ba2ce.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits) Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging. Doc clarification. Fallback to A8 text rendering on Mac when LCD smoothing is disabled Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1 Autotest that new "import Qt 4.7"s aren't added accidentally Document "import QtQuick 1.0" change Replace "import Qt 4.7" with "import QtQuick 1.0" Add test for Qt 4.7 module Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Correct property type of PathAttribute::value in the docs. Register QtQuick 1.0 module. Remove unused AST node destructors. Fix crash when trying to append a null transform to QDeclarativeItem. Documentation. Documentation fix for Flickable (mark content properties as real, not int). QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) ...
Diffstat (limited to 'examples/declarative/tutorials/helloworld/Cell.qml')
-rw-r--r--examples/declarative/tutorials/helloworld/Cell.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/tutorials/helloworld/Cell.qml b/examples/declarative/tutorials/helloworld/Cell.qml
index e64aa7e..76055ab 100644
--- a/examples/declarative/tutorials/helloworld/Cell.qml
+++ b/examples/declarative/tutorials/helloworld/Cell.qml
@@ -39,7 +39,7 @@
****************************************************************************/
//![0]
-import Qt 4.7
+import QtQuick 1.0
//![1]
Item {