diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 10:59:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 10:59:18 (GMT) |
| commit | 80fd32f23ef7bc2b7d1c1980b07b8c66520cd7f7 (patch) | |
| tree | 0b0e37ef1018de6ed97b26e7ea808e7c3b0fd8db /doc/src/declarative/codingconventions.qdoc | |
| parent | c5a0190054421ac5c3325bba6835b63c70b6bda2 (diff) | |
| parent | 8dca45fa2ad0f260143282ee01d52e72f8f88a68 (diff) | |
| download | Qt-80fd32f23ef7bc2b7d1c1980b07b8c66520cd7f7.zip Qt-80fd32f23ef7bc2b7d1c1980b07b8c66520cd7f7.tar.gz Qt-80fd32f23ef7bc2b7d1c1980b07b8c66520cd7f7.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)
Small calculator fix.
Improve declarative calculator example.
Update examples autotest to use the runtime directly
Support valuetypes as method return values
Compile without Qt3 support.
Doc
Simplify dynamic resource loading to avoid cluttering Text API.
Add Component.onDestruction attached property
Use qmlInfo for image loading errors, not qWarning().
Visual test updates.
Rename section so that it's not linked to by references to "JavaScript"
Doc improvements
Comments
Remove unused parameter
Correctly resolve, and load, IMG tags in Text element.
Rename "sql" test so autotester doesn't get confused.
Should work now, don't skip.
ignore autotester logs
Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData
Rename QDeclarativeData -> QAbstractDeclarativeData
...
Diffstat (limited to 'doc/src/declarative/codingconventions.qdoc')
| -rw-r--r-- | doc/src/declarative/codingconventions.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/codingconventions.qdoc b/doc/src/declarative/codingconventions.qdoc index e1e7871..7ae5cbd 100644 --- a/doc/src/declarative/codingconventions.qdoc +++ b/doc/src/declarative/codingconventions.qdoc @@ -101,7 +101,7 @@ we will write this: \snippet doc/src/snippets/declarative/codingconventions/lists.qml 1 -\section1 Javascript +\section1 Javascript code If the script is a single expression, we recommend writing it inline: |