diff options
| -rw-r--r-- | src/qml/doc/src/cppintegration/extending-tutorial.qdoc | 11 | ||||
| -rw-r--r-- | src/qml/doc/src/qmlfunctions.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/qtqml.qdoc | 10 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qml/qqml.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmllist.cpp | 5 | ||||
| -rw-r--r-- | src/qml/qml/qqmllocale.cpp | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc index 458768bf18..6e6d067ba6 100644 --- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc +++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc @@ -328,7 +328,7 @@ version 1.0 to the .pro file: \snippet tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h 0 \dots -\quotefile tutorials/extending-qml/chapter1-basics/chapter4-customPropertyTypes.pro +\quotefile tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro The source code from the following files are referred to in this chapter: \generatelist examplefiles .*chapter4.* @@ -391,17 +391,14 @@ by any QML application, instead of restricting these types to be only used by the one application. The steps for creating a plugin are described in \l {Creating C++ Plugins for QML}. -To start with, we create a plugin class named \c ChartsPlugin. It subclasses QQmlExtensionPlugin -and registers our QML types in the inherited \l{QQmlExtensionPlugin::}{registerTypes()} method. +To start with, we create a plugin class named \c ChartsPlugin. It subclasses +QQmlEngineExtensionPlugin and uses the Q_PLUGIN_METADATA() macro to register the +plugin with the Qt meta object system. Here is the \c ChartsPlugin definition in \c chartsplugin.h: \snippet tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h 0 -And its implementation in \c chartsplugin.cpp: - -\snippet tutorials/extending-qml/chapter6-plugins/import/chartsplugin.cpp 0 - Then, we write a \c .pro project file that defines the project as a plugin library and specifies with DESTDIR that library files should be built into a \c {../Charts} directory. diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index 82ce7cbf92..f7a84e6584 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -164,7 +164,7 @@ if the type is available in QML, by having a \l QML_ELEMENT or \l QML_NAMED_ELEMENT() macro. By default, each QQmlEngine will try to create a singleton instance using either the type's default constructor or a static - factory function of the signature \a{T *create(QQmlEngine *, QJSEngine *)} + factory function of the signature \c{T *create(QQmlEngine *, QJSEngine *)} when the type is first accessed. If both do exist and are accessible, the default constructor is preferred. If there is no default constructor and no factory function the singleton is initially inaccessible. This behavior can be diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc index 5a1b59acdd..9c2ce11aa0 100644 --- a/src/qml/doc/src/qtqml.qdoc +++ b/src/qml/doc/src/qtqml.qdoc @@ -134,10 +134,12 @@ the QML code to interact with C++ code. \li \l{Integrating QML and C++} \endlist -\section1 Additional Frameworks -\list -\li \l{The Declarative State Machine Framework} -\endlist +\omit + \section1 Additional Frameworks + \list + \li \l{The Declarative State Machine Framework} + \endlist +\endomit \section1 Licenses and Attributions diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index ca18bb61e6..a96ded68f0 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -485,7 +485,7 @@ static QUrl urlForFileName(const QString &fileName) the file name is accessible through the "fileName" property if it is provided with this function. - \a stackTrace is used to report whether an uncaught exception was + \a exceptionStackTrace is used to report whether an uncaught exception was thrown. If you pass a non-null pointer to a QStringList to it, it will set it to list of "stackframe messages" if the script threw an unhandled exception, or an empty list otherwise. A stackframe message has the format @@ -495,8 +495,8 @@ static QUrl urlForFileName(const QString &fileName) \note If an exception was thrown and the exception value is not an Error instance (i.e., QJSValue::isError() returns \c false), the - exception value will still be returned. Use \a stackTrace->isEmpty() to - distinguish whether the value was a normal or an exceptional return + exception value will still be returned. Use \c exceptionStackTrace->isEmpty() + to distinguish whether the value was a normal or an exceptional return value. */ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, int lineNumber, QStringList *exceptionStackTrace) diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp index 56a0595e0e..20608a60e4 100644 --- a/src/qml/qml/qqml.cpp +++ b/src/qml/qml/qqml.cpp @@ -110,11 +110,11 @@ static QTypeRevision resolveModuleVersion(int moduleMajor) */ /*! - * Registers an implicit import for module \a uri of major version \a majorVersion + * Registers an implicit import for module \a uri of major version \a majorVersion. * * This has the same effect as an \c import statement in a qmldir file: Whenever * \a uri of version \a moduleMajor is imported, \a import of version - * \a importMajor.\a importMinor is automatically imported, too. If + * \a importMajor. \a importMinor is automatically imported, too. If * \a importMajor is \l QmlModuleImportLatest the latest version * available of that module is imported, and \a importMinor does not matter. If * \a importMinor is \l QmlModuleImportLatest the latest minor version of a diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 588ccea11c..c41c1d9a54 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -543,7 +543,7 @@ The following functions are also on the Qt object. \li application.font \endlist - \sa Screen, Window, {QtQuick.Window::Window::screen}{Window.screen} + \sa Screen, Window, {Window::screen}{Window.screen} */ /*! diff --git a/src/qml/qml/qqmllist.cpp b/src/qml/qml/qqmllist.cpp index a0d34cbce7..887fe66bc1 100644 --- a/src/qml/qml/qqmllist.cpp +++ b/src/qml/qml/qqmllist.cpp @@ -648,8 +648,9 @@ Remove the last element from the list \a property. /*! \fn bool QQmlListReference::operator==(const QQmlListReference &other) const -Compares two QQmlListReferences. They are only considered equal if one was -created from the other via copy assignment or copy construction. +Compares this QQmlListReference to \a other, and returns \c true if they are +equal. The two are only considered equal if one was created from the other +via copy assignment or copy construction. \note Independently created references to the same object are not considered to be equal. diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 5109574654..8f11bc248d 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -731,7 +731,7 @@ V4_DEFINE_EXTENSION(QV4LocaleDataDeletable, localeV4Data); /*! \qmltype Locale - \instantiates QQmlLocale + //! \instantiates QQmlLocale \inqmlmodule QtQml \brief Provides locale specific properties and formatted data. |