diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 03:00:04 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 03:00:04 +0200 |
| commit | f06719db0e8fd84080042f9b23b83db47d6453f7 (patch) | |
| tree | 8a524e2aadd4afd5c60971364241fc2d7db80e8e | |
| parent | 06386a0c7bfe08f40b4ad090c79bcc09031fb8c0 (diff) | |
| parent | 8d2c11ac2352556167dc4a86172cd9bc3a979ed8 (diff) | |
| download | qtscript-f06719db0e8fd84080042f9b23b83db47d6453f7.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I47e91495d6da245132e7bf2bf836d81b95349f51
| -rw-r--r-- | src/script/doc/src/includes/deprecation.qdocinc | 3 | ||||
| -rw-r--r-- | src/script/doc/src/qtscript-index.qdoc | 2 | ||||
| -rw-r--r-- | src/script/doc/src/qtscript-module.qdoc | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/script/doc/src/includes/deprecation.qdocinc b/src/script/doc/src/includes/deprecation.qdocinc new file mode 100644 index 0000000..3fb2233 --- /dev/null +++ b/src/script/doc/src/includes/deprecation.qdocinc @@ -0,0 +1,3 @@ +\warning This module is not actively developed. It is provided for backwards +compatibility with Qt 4 only. For new code, use \l QJSEngine and related +classes in the Qt QML module instead. diff --git a/src/script/doc/src/qtscript-index.qdoc b/src/script/doc/src/qtscript-index.qdoc index 6cf347f..a489d1c 100644 --- a/src/script/doc/src/qtscript-index.qdoc +++ b/src/script/doc/src/qtscript-index.qdoc @@ -33,6 +33,8 @@ The following guides and references cover aspects of programming with ECMAScript and Qt. + \include deprecation.qdocinc + \tableofcontents \section1 Licenses and Attributions diff --git a/src/script/doc/src/qtscript-module.qdoc b/src/script/doc/src/qtscript-module.qdoc index 8e47042..edfbf17 100644 --- a/src/script/doc/src/qtscript-module.qdoc +++ b/src/script/doc/src/qtscript-module.qdoc @@ -38,10 +38,7 @@ Qt Script Tools module provides additional Qt Script-related components that application developers may find useful. - This module is mainly provided for backwards compatibility reasons - with Qt 4.x and not being actively developed any further. For new - code please consider using the QJSEngine, etc. classes in the - Qt Qml module instead. + \include deprecation.qdocinc To include the definitions of the module's classes, use the following directive: |