diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /doc/src/qml/qtjavascript.qdoc | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'doc/src/qml/qtjavascript.qdoc')
| -rw-r--r-- | doc/src/qml/qtjavascript.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/qml/qtjavascript.qdoc b/doc/src/qml/qtjavascript.qdoc index 394435f77b..0775730dd3 100644 --- a/doc/src/qml/qtjavascript.qdoc +++ b/doc/src/qml/qtjavascript.qdoc @@ -64,7 +64,7 @@ Custom properties can be made available to scripts by registering them with the script engine. This is most easily done by setting - properties of the script engine's \i{Global Object}: + properties of the script engine's \e{Global Object}: \snippet doc/src/snippets/qtjavascript/registeringvalues/main.cpp 0 |