diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2015-02-02 12:43:49 +0100 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-02-04 08:30:13 +0000 |
| commit | 566b23df8c31b50fc514a069564d23121d0f4ef9 (patch) | |
| tree | f3e070f58012677cb6bca2467635d25d5962c1b2 /src/qml/doc | |
| parent | 9663b7b5c1a051b46a731b0587a4623a2ab21b0d (diff) | |
Doc: link issues qtdeclarative
Task-number: QTBUG-43810
Change-Id: I154ffa83512435c3e455937a3f81931a45d9e368
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/qtqml.qdocconf | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc | 5 | ||||
| -rw-r--r-- | src/qml/doc/src/whatsnew.qdoc | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 7738cb3eef..5729a60ea3 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -33,7 +33,7 @@ qhp.QtQml.subprojects.qmltypes.sortPages = true tagfile = ../../../doc/qtqml/qtqml.tags -depends += qtcore qtxmlpatterns qtgui qtquick qtdoc qtlinguist qmake qtscript +depends += qtcore qtxmlpatterns qtgui qtquick qtdoc qtlinguist qmake qtscript qtwidgets headerdirs += .. \ ../../imports/models diff --git a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc index 1a154e5d5a..93a36e80fc 100644 --- a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc +++ b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc @@ -499,9 +499,6 @@ property is only invoked when the property is reassigned to a different object v may also explicitly preserve the scarce resource by calling the "preserve" method on the \c var property from within JavaScript. - For more information regarding the usage of a scarce resource, please - see \l{Scarce Resources in JavaScript}. - This basic type is provided by the QML language. */ @@ -543,8 +540,6 @@ property is only invoked when the property is reassigned to a different object v "destroy" method on the \c variant property from within JavaScript. They may also explicitly preserve the scarce resource by calling the "preserve" method on the \c variant property from within JavaScript. - For more information on the usage of a scarce resource, please - see \l{Scarce Resources in JavaScript}. \section1 Storing Arrays and Objects diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index 10e7108207..11b899e926 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -95,7 +95,6 @@ has now been replaced by the new \l {Qt QML} and \l {Qt Quick} modules. See the \li New \l var property type. This is a general-purpose property type which obsoletes the \l variant type. Properties of the \l var type may hold JavaScript references. \li QML properties of type \l var and \l variant can now hold pixmaps. - See \l {Scarce Resources in JavaScript} for more information. \li Value type improvements: \list \li QML now supports defining properties of value type basic types within QML documents. Supported types include |