diff options
| -rw-r--r-- | doc/src/objectmodel/metaobjects.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/objectmodel/object.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/objectmodel/properties.qdoc | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 20 | ||||
| -rw-r--r-- | src/corelib/tools/qrect.cpp | 8 | ||||
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 17 |
6 files changed, 30 insertions, 19 deletions
diff --git a/doc/src/objectmodel/metaobjects.qdoc b/doc/src/objectmodel/metaobjects.qdoc index e891183..f6fcc44 100644 --- a/doc/src/objectmodel/metaobjects.qdoc +++ b/doc/src/objectmodel/metaobjects.qdoc @@ -45,6 +45,7 @@ \ingroup qt-basic-concepts \brief An overview of Qt's meta-object system and introspection capabilities. \keyword meta-object + \target Meta-Object System Qt's meta-object system provides the signals and slots mechanism for inter-object communication, run-time type information, and the dynamic diff --git a/doc/src/objectmodel/object.qdoc b/doc/src/objectmodel/object.qdoc index e0ba6ed..f81577d 100644 --- a/doc/src/objectmodel/object.qdoc +++ b/doc/src/objectmodel/object.qdoc @@ -45,8 +45,6 @@ \ingroup qt-basic-concepts \brief A description of the powerful features made possible by Qt's dynamic object model. - \ingroup frameworks-technologies - The standard C++ object model provides very efficient runtime support for the object paradigm. But its static nature is inflexibile in certain problem domains. Graphical user interface diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc index bc9554c..7f876c3 100644 --- a/doc/src/objectmodel/properties.qdoc +++ b/doc/src/objectmodel/properties.qdoc @@ -44,6 +44,7 @@ \title The Property System \ingroup qt-basic-concepts \brief An overview of Qt's property system. + \target Qt's Property System Qt provides a sophisticated property system similar to the ones supplied by some compiler vendors. However, as a compiler- and diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 6a6db51..8330e47 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -542,7 +542,7 @@ int QMetaCallEvent::placeMetaCall(QObject *object) \reentrant - QObject is the heart of the \l{Qt object model}. The central + QObject is the heart of the Qt \l{Object Model}. The central feature in this model is a very powerful mechanism for seamless object communication called \l{signals and slots}. You can connect a signal to a slot with connect() and destroy the @@ -551,13 +551,13 @@ int QMetaCallEvent::placeMetaCall(QObject *object) protected functions connectNotify() and disconnectNotify() make it possible to track connections. - QObjects organize themselves in \l {Object Trees and Object - Ownership} {object trees}. When you create a QObject with another - object as parent, the object will automatically add itself to the - parent's children() list. The parent takes ownership of the - object; i.e., it will automatically delete its children in its - destructor. You can look for an object by name and optionally type - using findChild() or findChildren(). + QObjects organize themselves in \l {Object Trees & Ownership} + {object trees}. When you create a QObject with another object as + parent, the object will automatically add itself to the parent's + children() list. The parent takes ownership of the object; i.e., + it will automatically delete its children in its destructor. You + can look for an object by name and optionally type using + findChild() or findChildren(). Every object has an objectName() and its class name can be found via the corresponding metaObject() (see QMetaObject::className()). @@ -609,7 +609,7 @@ int QMetaCallEvent::placeMetaCall(QObject *object) Qt classes derived from QObject (direct or indirect) use this macro to declare their copy constructor and assignment operator to be private. The reasoning is found in the discussion on - \l{Identity vs Value} {Identity vs Value} on the \l{Qt Object + \l{Identity vs Value} {Identity vs Value} on the Qt \l{Object Model} page. The main consequence is that you should use pointers to QObject @@ -656,7 +656,7 @@ int QMetaCallEvent::placeMetaCall(QObject *object) \l{Writing Source Code for Translation} document. \sa QMetaObject, QPointer, QObjectCleanupHandler, Q_DISABLE_COPY() - \sa {Object Trees and Object Ownership} + \sa {Object Trees & Ownership} */ /*! diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index 80563ae..308a561 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -1272,7 +1272,7 @@ bool QRect::intersects(const QRect &r) const Writes the given \a rectangle to the given \a stream, and returns a reference to the stream. - \sa {Format of the QDataStream Operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator<<(QDataStream &s, const QRect &r) @@ -1293,7 +1293,7 @@ QDataStream &operator<<(QDataStream &s, const QRect &r) Reads a rectangle from the given \a stream into the given \a rectangle, and returns a reference to the stream. - \sa {Format of the QDataStream Operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator>>(QDataStream &s, QRect &r) @@ -2420,7 +2420,7 @@ QRect QRectF::toAlignedRect() const Writes the \a rectangle to the \a stream, and returns a reference to the stream. - \sa \link datastreamformat.html Format of the QDataStream operators \endlink + \sa {Serializing Qt Data Types} */ QDataStream &operator<<(QDataStream &s, const QRectF &r) @@ -2437,7 +2437,7 @@ QDataStream &operator<<(QDataStream &s, const QRectF &r) Reads a \a rectangle from the \a stream, and returns a reference to the stream. - \sa \link datastreamformat.html Format of the QDataStream operators \endlink + \sa {Serializing Qt Data Types} */ QDataStream &operator>>(QDataStream &s, QRectF &r) diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 03d535c..86915bb 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -294,9 +294,20 @@ QT_BEGIN_NAMESPACE This enum specifies the ownership when wrapping a C++ value, e.g. by using newQObject(). - \value QtOwnership The standard Qt ownership rules apply, i.e. the associated object will never be explicitly deleted by the script engine. This is the default. (QObject ownership is explained in \l{Object Trees and Object Ownership}.) - \value ScriptOwnership The value is owned by the script environment. The associated data will be deleted when appropriate (i.e. after the garbage collector has discovered that there are no more live references to the value). - \value AutoOwnership If the associated object has a parent, the Qt ownership rules apply (QtOwnership); otherwise, the object is owned by the script environment (ScriptOwnership). + \value QtOwnership The standard Qt ownership rules apply, i.e. the + associated object will never be explicitly deleted by the script + engine. This is the default. (QObject ownership is explained in + \l{Object Trees & Ownership}.) + + \value ScriptOwnership The value is owned by the script + environment. The associated data will be deleted when appropriate + (i.e. after the garbage collector has discovered that there are no + more live references to the value). + + \value AutoOwnership If the associated object has a parent, the Qt + ownership rules apply (QtOwnership); otherwise, the object is + owned by the script environment (ScriptOwnership). + */ /*! |