diff options
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/doc/src/cppintegration/contextproperties.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/data.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/topic.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/expressions.qdoc | 6 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/imports.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/qmlfunctions.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/documents/scope.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/whatsnew.qdoc | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 4 | ||||
| -rw-r--r-- | src/qml/types/qqmltimer.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qquickpackage.cpp | 3 |
11 files changed, 15 insertions, 16 deletions
diff --git a/src/qml/doc/src/cppintegration/contextproperties.qdoc b/src/qml/doc/src/cppintegration/contextproperties.qdoc index abdc18981a..d30cc87345 100644 --- a/src/qml/doc/src/cppintegration/contextproperties.qdoc +++ b/src/qml/doc/src/cppintegration/contextproperties.qdoc @@ -91,7 +91,7 @@ following examples: \li \l {Models and Views: AbstractItemModel Example}{AbstractItemModel} \endlist -demonstrating the use of QStringList, \l{QList<QObject*>}-based models and +demonstrating the use of QStringList, QList<QObject*>-based models and QAbstractItemModel in QML views. Also see the QQmlContext documentation for more information. diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc index ee5316c19f..68233747b7 100644 --- a/src/qml/doc/src/cppintegration/data.qdoc +++ b/src/qml/doc/src/cppintegration/data.qdoc @@ -59,7 +59,7 @@ instance which already has a parent. \section1 Basic Qt Data Types By default, QML recognizes the following Qt data types, which are -automatically converted to a corresponding \l {QML Basic Type}{QML basic type} +automatically converted to a corresponding \l {QML Basic Types}{QML basic type} when passed from C++ to QML and vice-versa: \table diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc index 4d12ab9d08..67e76e3e5e 100644 --- a/src/qml/doc/src/cppintegration/topic.qdoc +++ b/src/qml/doc/src/cppintegration/topic.qdoc @@ -98,7 +98,7 @@ more information. \section1 Defining QML Types from C++ QML types can be defined in C++ and then registered with the \l{qtqml-typesystem-topic.html}{QML -type system}. This allows a C++ class to be instantiated as a \l {QML object type}, enabling custom +type system}. This allows a C++ class to be instantiated as a \l {QML Object Types}{QML object type}, enabling custom object types to be implemented in C++ and integrated into existing QML code. A C++ class may be also registered for other purposes: for example, it could be registered as a \e {Singleton Type} to enable a single class instance to be imported by QML code, or it could be registered to enable the diff --git a/src/qml/doc/src/javascript/expressions.qdoc b/src/qml/doc/src/javascript/expressions.qdoc index a8e6fc8ac0..13238b2e43 100644 --- a/src/qml/doc/src/javascript/expressions.qdoc +++ b/src/qml/doc/src/javascript/expressions.qdoc @@ -71,7 +71,7 @@ logic. There are four ways that JavaScript can be used in a QML document: \li \l{Method Attributes}{custom methods} can be defined in QML files as JavaScript functions \li JavaScript files providing functions and variables can be - \l{Importing JavaScript Files in QML Documents}{imported} in a QML + \l{Importing JavaScript Resources in QML}{imported} in a QML document \endlist @@ -103,7 +103,7 @@ property binding definition, as long as the result of the expression is a value whose type can be assigned to the property. There are two ways to define a property binding: the first (and most common) -is, as previously shown, in a \l{QML Object Attributes#property-initialization} +is, as previously shown, in a \l{QML Object Attributes#Value Assignment on Initialization} {property initialization}. The second (and much rarer) way is to assign the property a function returned from the \l{Qt::binding()}{Qt.binding()} function, from within imperative JavaScript code, as shown below: @@ -259,7 +259,7 @@ Item { \endqml For more information about loading external JavaScript files into QML, read -the section about \l{Importing JavaScript Files in QML Documents}. +the section about \l{Importing JavaScript Resources in QML}. diff --git a/src/qml/doc/src/javascript/imports.qdoc b/src/qml/doc/src/javascript/imports.qdoc index fa9aa9794c..d70d33fee6 100644 --- a/src/qml/doc/src/javascript/imports.qdoc +++ b/src/qml/doc/src/javascript/imports.qdoc @@ -32,7 +32,7 @@ \l{qtqml-javascript-resources.html}{JavaScript resources} may be imported by QML documents and other JavaScript resources. JavaScript resources may be imported via either relative or absolute URLs. In the case of a relative URL, -the location is resolved relative to the location of the \l {QML Document} or +the location is resolved relative to the location of the \l {QML Documents}{QML document} or \l{qtqml-javascript-resources.html}{JavaScript Resource} that contains the import. If the script file is not accessible, an error will occur. If the JavaScript needs to be fetched from a network resource, the component's diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index b4b8fce162..cd4e86bd31 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -51,7 +51,7 @@ \fn void qmlClearTypeRegistrations() \relates QQmlEngine - Clears all stored type registrations, such as those produced with \l qmlRegisterType. + Clears all stored type registrations, such as those produced with qmlRegisterType(). Do not call this function while a QQmlEngine exists or behavior will be undefined. Any existing QQmlEngines must be deleted before calling this function. This function diff --git a/src/qml/doc/src/qmllanguageref/documents/scope.qdoc b/src/qml/doc/src/qmllanguageref/documents/scope.qdoc index 9da77a4905..870eb21a07 100644 --- a/src/qml/doc/src/qmllanguageref/documents/scope.qdoc +++ b/src/qml/doc/src/qmllanguageref/documents/scope.qdoc @@ -76,7 +76,7 @@ with local variables declared in another. \section1 Type Names and Imported JavaScript Files -\l {QML Document}s include import statements that define the type names +\l {QML Documents} include import statements that define the type names and JavaScript files visible to the document. In addition to their use in the QML declaration itself, type names are used by JavaScript code when accessing \l {Attached Properties} and enumeration values. diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index bf457d7ee6..a0e5202174 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -40,8 +40,8 @@ a summary of the new changes: \li The 'with' statement has been deprecated and is slated for removal in a future version of the language. \li New \l Qt.platform object with an os property -\li New \l qmlClearTypeRegistations() function drops all data from qmlRegisterType calls -\li New \l qmlRegisterType function for registering composite types. +\li New \l qmlClearTypeRegistrations() function drops all data from qmlRegisterType() calls +\li New \l qmlRegisterType() function for registering composite types. \endlist \section2 New Submodule diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index bc804c4f2d..cb05a2bef8 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -218,7 +218,7 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject) Components are often defined by \l {{QML Documents}}{component files} - that is, \c .qml files. The \e Component type essentially allows QML components - to be defined inline, within a \l {QML Document}{QML document}, rather than as a separate QML file. + to be defined inline, within a \l {QML Documents}{QML document}, rather than as a separate QML file. This may be useful for reusing a small component within a QML file, or for defining a component that logically belongs with other QML components within a file. @@ -235,7 +235,7 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject) two \l Loader objects). Because Component is not derived from Item, you cannot anchor anything to it. - Defining a \c Component is similar to defining a \l {QML Document}{QML document}. + Defining a \c Component is similar to defining a \l {QML Documents}{QML document}. A QML document has a single top-level item that defines the behavior and properties of that component, and cannot define properties or behavior outside of that top-level item. In the same way, a \c Component definition contains a single diff --git a/src/qml/types/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp index 7d1c41aeab..32018c1f03 100644 --- a/src/qml/types/qqmltimer.cpp +++ b/src/qml/types/qqmltimer.cpp @@ -109,7 +109,7 @@ public: elapsed time will be reset to 0, and the Timer will be triggered 1000ms later. - \sa {declarative/toys/clocks}{Clocks example} + \sa {Qt Quick Demo - Clocks} */ QQmlTimer::QQmlTimer(QObject *parent) diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp index 2ce9ca36d8..1fed95eb85 100644 --- a/src/qml/types/qquickpackage.cpp +++ b/src/qml/types/qquickpackage.cpp @@ -73,8 +73,7 @@ QT_BEGIN_NAMESPACE \snippet quick/views/package/view.qml 0 - \sa {quick/views/package}{Package example}, {quick/demos/photoviewer}{Photo - Viewer example}, {Qt QML} + \sa {quick/views/package}{Package example}, {Qt Quick Demo - Photo Viewer}, {Qt QML} */ /*! |