diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:27:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:27:21 +0200 |
| commit | 751cf692dcc5cd915841f1a7833f4848a5ab7c04 (patch) | |
| tree | c65440a100d8fc23fb1139ac0a887923f6b7c4fc /src | |
| parent | 7e144791ab48329ec7db4a3b6bd9789c9275da77 (diff) | |
| parent | a8e3602554c3225046a831cad7a727a56501439b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4231685b78a7886928efe191aa7f09bb8a50e81e
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/doc/src/external-resources.qdoc | 6 | ||||
| -rw-r--r-- | src/script/doc/src/qtscript-index.qdoc | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/script/doc/src/external-resources.qdoc b/src/script/doc/src/external-resources.qdoc index cb6af34..0d4cae9 100644 --- a/src/script/doc/src/external-resources.qdoc +++ b/src/script/doc/src/external-resources.qdoc @@ -34,9 +34,3 @@ \externalpage http://www.davidflanagan.com/javascript5/ \title JavaScript: The Definitive Guide */ - -/*! - \externalpage http://qt.nokia.com/products/library/modular-class-library#info_scripting - \title Qt Script for Applications (QSA) -*/ - diff --git a/src/script/doc/src/qtscript-index.qdoc b/src/script/doc/src/qtscript-index.qdoc index a3fd908..663b1e6 100644 --- a/src/script/doc/src/qtscript-index.qdoc +++ b/src/script/doc/src/qtscript-index.qdoc @@ -52,10 +52,6 @@ several existing tutorials and books that cover this subject, such as \l{JavaScript: The Definitive Guide}. - Existing users of \l{Qt Script for Applications (QSA)} may find the - \l{Moving from QSA to Qt Script} document useful when porting - QSA scripts to Qt Script. - \section1 Basic Usage To evaluate script code, you create a QScriptEngine and call its |