diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-22 14:57:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-22 14:57:51 (GMT) |
| commit | 91bc1f39788a4a097e65f542b8515c68313ec17f (patch) | |
| tree | 111f23861ce66ca30a17189fb611ff3854b57d66 /doc/src/declarative/javascriptblocks.qdoc | |
| parent | edd574758bdc4223a3d38b0f5cd0e1f11c537b55 (diff) | |
| parent | 4c47a46be986681225b67faa73f957276636cc30 (diff) | |
| download | Qt-91bc1f39788a4a097e65f542b8515c68313ec17f.zip Qt-91bc1f39788a4a097e65f542b8515c68313ec17f.tar.gz Qt-91bc1f39788a4a097e65f542b8515c68313ec17f.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (43 commits)
Doc: Added a missing license header.
Fix timer warning when deleting item views
More testing for KeyNavigation attached properties.
Add tests for ListView.indexAt() and GridView.IndexAt()
runonphone: Only print the modprobe instructions on linux
reword: Make the USB serial device enumeration work on OS X, too
runonphone: Check that the device->config is valid before dereferencing it
Remove few compile warnings
Fix using QFileDialog statics in Symbian.
Setting TextInput.cursorPosition outside bounds crashed.
Update test bitmaps for QDeclarativeImage::svg() autotest on Windows
Don't truncate image:// url strings prematurely
Update docs on importing javascript files
Fix deployment of minehunt for Symbian
Quiet unused parameter warnings.
doc: Replaced some \raw and \endraw uses with \table and \endtable
doc: Replaced some \raw and \endraw uses with \table and \endtable
doc: Replaced some \raw and \endraw uses with \table and \endtable
Doc: Added a note about the Public Suffix List.
Doc: Fixed doc bug in Diagram Scene example
...
Diffstat (limited to 'doc/src/declarative/javascriptblocks.qdoc')
| -rw-r--r-- | doc/src/declarative/javascriptblocks.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc index 155bd6e..68cb392 100644 --- a/doc/src/declarative/javascriptblocks.qdoc +++ b/doc/src/declarative/javascriptblocks.qdoc @@ -99,7 +99,9 @@ resource, the component's \l {QDeclarativeComponent::status()}{status} is set to Imported JavaScript files are always qualified using the "as" keyword. The qualifier for JavaScript files must be unique, so there is always a one-to-one -mapping between qualifiers and JavaScript files. +mapping between qualifiers and JavaScript files. (This also means qualifiers cannot +be named the same as built-in JavaScript objects such as \c Date and \c Math). + \section2 Code-Behind Implementation Files |