diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 05:11:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 05:11:09 (GMT) |
| commit | db51f7d5452f645db252341d8a633a299b2ef2e1 (patch) | |
| tree | 1be01d82f6ac68e159d3a9da9d86eac96835f82d /doc/src/declarative/qdeclarativei18n.qdoc | |
| parent | 09293f1d07b019dc7bfe95afb93364cc87774e82 (diff) | |
| parent | f0826662baaf7916f7b5f4fa9c8e9abab457731d (diff) | |
| download | Qt-db51f7d5452f645db252341d8a633a299b2ef2e1.zip Qt-db51f7d5452f645db252341d8a633a299b2ef2e1.tar.gz Qt-db51f7d5452f645db252341d8a633a299b2ef2e1.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: (29 commits)
Plugins documentation.
Fix update issue when an item has an effect and child.
Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints.
Disallow "Qt" as namespace import
Don't "adjust" the z value of a delegate that has been cached.
Correctly inherit extension properties
Autotests
More QDeclarativeNetworkAccessManagerFactory doc clarification.
Fix QDeclarativeNetworkAccessManagerFactory docs.
Don't crash on invalid model remove signal.
Ensure scheduled layout can occur before testing.
Fix remaining 4.6 type registrations (to 4.7).
doc anchor margins vs. anchor (line) state/animation.
These examples should not be included in this test
Unify naming of settings / UI to be "Qt Qml Runtime"
Improved error messages for type resolving, new debug option
Link to example files from tutorial pages
Add tutorial for writing QML extensions
no export in plugin
Add doc pages for qml examples.
...
Diffstat (limited to 'doc/src/declarative/qdeclarativei18n.qdoc')
| -rw-r--r-- | doc/src/declarative/qdeclarativei18n.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/qdeclarativei18n.qdoc b/doc/src/declarative/qdeclarativei18n.qdoc index 0a48dd9..c7dbd4d 100644 --- a/doc/src/declarative/qdeclarativei18n.qdoc +++ b/doc/src/declarative/qdeclarativei18n.qdoc @@ -86,7 +86,7 @@ lupdate hello.qml -ts hello.ts \endcode Then we open \c hello.ts in \l{Qt Linguist Manual} {Linguist}, provide -a translation and create the release file \c hello.qml. +a translation and create the release file \c hello.qm. Finally, we can test the translation: \code |