diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 16:02:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 16:02:03 (GMT) |
| commit | 591807899deb3fc479bd32722756f74b899977d5 (patch) | |
| tree | 02496fb98624fc56cd8614067028118f55710ed1 /doc/src/declarative/scope.qdoc | |
| parent | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (diff) | |
| parent | 47284ca360c1875663207996740bf6ed6e93d364 (diff) | |
| download | Qt-591807899deb3fc479bd32722756f74b899977d5.zip Qt-591807899deb3fc479bd32722756f74b899977d5.tar.gz Qt-591807899deb3fc479bd32722756f74b899977d5.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:
Document and test paintedWidth and paintedHeight properties of Image
Add missing license header.
Improve test coverage for declarative module.
Avoid potential null dereference.
Add autotest for reserved words in QML.
Prevent crash in XmlListModel when appending an empty role.
Remove unused, unexported class.
Fix clipping behavior for non-cached text.
Compile
Only cache textlayout in paint engines that support transformations
QmlDebugService: Fix compiler warning about cast from ascii
Qt.openUrlExternally should resolve relative URLs.
Doc: add missing image.
Doc: typographical and spelling errors.
Doc: remove unfinished and confusing mention to focus panels.
Apply the QStaticText text-caching strategy for QML
Documentation: input to Qt.rgba should be from 0-1, not 0-255.
Diffstat (limited to 'doc/src/declarative/scope.qdoc')
| -rw-r--r-- | doc/src/declarative/scope.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc index 5501242..17f8632 100644 --- a/doc/src/declarative/scope.qdoc +++ b/doc/src/declarative/scope.qdoc @@ -174,7 +174,7 @@ PathView { } \endcode -If the \l Image element omitted the \c root prefix, it would inadvertantly access +If the \l Image element omitted the \c root prefix, it would inadvertently access the unset \c {PathView.scale} attached property on itself. \section1 Component Scope |