diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-15 08:06:53 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-15 08:06:53 (GMT) |
| commit | 69005b4cbae57928df7ade8f9f60ad0aabd128bc (patch) | |
| tree | 2560ec24adcf71383f7e9fb5f3ea263f6bc6eb10 /doc | |
| parent | ca7a96943c122b8371caf98dc92f7e6644de1814 (diff) | |
| download | Qt-69005b4cbae57928df7ade8f9f60ad0aabd128bc.zip Qt-69005b4cbae57928df7ade8f9f60ad0aabd128bc.tar.gz Qt-69005b4cbae57928df7ade8f9f60ad0aabd128bc.tar.bz2 | |
Changed Javascript guide link in Intro to the QML Language page.
Replaced link to commercial Javascript book.
Reviewed-by: Geir Vattekar
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/qdeclarativeintro.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/external-resources.qdoc | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc index 87dafb0..1d807e3 100644 --- a/doc/src/declarative/qdeclarativeintro.qdoc +++ b/doc/src/declarative/qdeclarativeintro.qdoc @@ -37,7 +37,7 @@ interface is specified as a tree of objects with properties. This introduction is meant for those with little or no programming experience. JavaScript is used as a scripting language in QML, so you may want -to learn a bit more about it (\l{JavaScript: The Definitive Guide}) before diving +to learn a bit more about it (\l{Javascript Guide}) before diving deeper into QML. It's also helpful to have a basic understanding of other web technologies like HTML and CSS, but it's not required. @@ -65,8 +65,8 @@ types always begin with a capital letter. In the above example, there are two objects, a \l Rectangle, and an \l Image. Between the braces, we can specify information about the object, such as its properties. -Properties are specified as \c {property: value}. In the above example, we -can see the Image has a property named \c source, which has been assigned the +Properties are specified as \c {property: value}. In the above example, we +can see the Image has a property named \c source, which has been assigned the value \c "pics/logo.png". The property and its value are separated by a colon. Properties can be specified one-per-line: diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 3041046..a23ae4d 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -440,6 +440,11 @@ */ /*! + \externalpage https://developer.mozilla.org/en/JavaScript/Guide + \title JavaScript Guide +*/ + +/*! \externalpage https://developer.mozilla.org/en/JavaScript/About_JavaScript \title About JavaScript */ |