diff options
Diffstat (limited to 'src/declarative/util')
20 files changed, 180 insertions, 180 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 977f7fa0d9..11e1c7cc0a 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -74,8 +74,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Animation QDeclarativeAbstractAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \brief The Animation element is the base of all QML animations. The Animation element cannot be used directly in a QML file. It exists @@ -99,7 +99,7 @@ QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(QDeclarativeAbstrac } /*! - \qmlproperty bool Animation::running + \qmlproperty bool QtQuick2::Animation::running This property holds whether the animation is currently running. The \c running property can be set to declaratively control whether or not @@ -236,7 +236,7 @@ void QDeclarativeAbstractAnimation::setRunning(bool r) } /*! - \qmlproperty bool Animation::paused + \qmlproperty bool QtQuick2::Animation::paused This property holds whether the animation is currently paused. The \c paused property can be set to declaratively control whether or not @@ -303,7 +303,7 @@ void QDeclarativeAbstractAnimation::componentFinalized() } /*! - \qmlproperty bool Animation::alwaysRunToEnd + \qmlproperty bool QtQuick2::Animation::alwaysRunToEnd This property holds whether the animation should run to completion when it is stopped. If this true the animation will complete its current iteration when it @@ -335,7 +335,7 @@ void QDeclarativeAbstractAnimation::setAlwaysRunToEnd(bool f) } /*! - \qmlproperty int Animation::loops + \qmlproperty int QtQuick2::Animation::loops This property holds the number of times the animation should play. By default, \c loops is 1: the animation will play through once and then stop. @@ -412,7 +412,7 @@ void QDeclarativeAbstractAnimation::setGroup(QDeclarativeAnimationGroup *g) } /*! - \qmlmethod Animation::start() + \qmlmethod QtQuick2::Animation::start() \brief Starts the animation. If the animation is already running, calling this method has no effect. The @@ -424,7 +424,7 @@ void QDeclarativeAbstractAnimation::start() } /*! - \qmlmethod Animation::pause() + \qmlmethod QtQuick2::Animation::pause() \brief Pauses the animation. If the animation is already paused, calling this method has no effect. The @@ -436,7 +436,7 @@ void QDeclarativeAbstractAnimation::pause() } /*! - \qmlmethod Animation::resume() + \qmlmethod QtQuick2::Animation::resume() \brief Resumes a paused animation. If the animation is not paused, calling this method has no effect. The @@ -448,7 +448,7 @@ void QDeclarativeAbstractAnimation::resume() } /*! - \qmlmethod Animation::stop() + \qmlmethod QtQuick2::Animation::stop() \brief Stops the animation. If the animation is not running, calling this method has no effect. The @@ -473,7 +473,7 @@ void QDeclarativeAbstractAnimation::stop() } /*! - \qmlmethod Animation::restart() + \qmlmethod QtQuick2::Animation::restart() \brief Restarts the animation. This is a convenience method, and is equivalent to calling \c stop() and @@ -486,7 +486,7 @@ void QDeclarativeAbstractAnimation::restart() } /*! - \qmlmethod Animation::complete() + \qmlmethod QtQuick2::Animation::complete() \brief Stops the animation, jumping to the final property values. If the animation is not running, calling this method has no effect. The @@ -562,8 +562,8 @@ void QDeclarativeAbstractAnimation::timelineComplete() /*! \qmlclass PauseAnimation QDeclarativePauseAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits Animation \brief The PauseAnimation element provides a pause for an animation. @@ -600,7 +600,7 @@ void QDeclarativePauseAnimationPrivate::init() } /*! - \qmlproperty int PauseAnimation::duration + \qmlproperty int QtQuick2::PauseAnimation::duration This property holds the duration of the pause in milliseconds The default value is 250. @@ -633,8 +633,8 @@ QAbstractAnimation *QDeclarativePauseAnimation::qtAnimation() /*! \qmlclass ColorAnimation QDeclarativeColorAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits PropertyAnimation \brief The ColorAnimation element animates changes in color values. @@ -674,7 +674,7 @@ QDeclarativeColorAnimation::~QDeclarativeColorAnimation() } /*! - \qmlproperty color ColorAnimation::from + \qmlproperty color QtQuick2::ColorAnimation::from This property holds the color value at which the animation should begin. For example, the following animation is not applied until a color value @@ -711,7 +711,7 @@ void QDeclarativeColorAnimation::setFrom(const QColor &f) } /*! - \qmlproperty color ColorAnimation::to + \qmlproperty color QtQuick2::ColorAnimation::to This property holds the color value at which the animation should end. @@ -737,8 +737,8 @@ void QDeclarativeColorAnimation::setTo(const QColor &t) /*! \qmlclass ScriptAction QDeclarativeScriptAction + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits Animation \brief The ScriptAction element allows scripts to be run during an animation. @@ -782,7 +782,7 @@ void QDeclarativeScriptActionPrivate::init() } /*! - \qmlproperty script ScriptAction::script + \qmlproperty script QtQuick2::ScriptAction::script This property holds the script to run. */ QDeclarativeScriptString QDeclarativeScriptAction::script() const @@ -798,7 +798,7 @@ void QDeclarativeScriptAction::setScript(const QDeclarativeScriptString &script) } /*! - \qmlproperty string ScriptAction::scriptName + \qmlproperty string QtQuick2::ScriptAction::scriptName This property holds the the name of the StateChangeScript to run. This property is only valid when ScriptAction is used as part of a transition. @@ -871,8 +871,8 @@ QAbstractAnimation *QDeclarativeScriptAction::qtAnimation() /*! \qmlclass PropertyAction QDeclarativePropertyAction + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits Animation \brief The PropertyAction element allows immediate property changes during animation. @@ -958,10 +958,10 @@ void QDeclarativePropertyAction::setProperty(const QString &n) } /*! - \qmlproperty Object PropertyAction::target - \qmlproperty list<Object> PropertyAction::targets - \qmlproperty string PropertyAction::property - \qmlproperty string PropertyAction::properties + \qmlproperty Object QtQuick2::PropertyAction::target + \qmlproperty list<Object> QtQuick2::PropertyAction::targets + \qmlproperty string QtQuick2::PropertyAction::property + \qmlproperty string QtQuick2::PropertyAction::properties These properties determine the items and their properties that are affected by this action. @@ -994,7 +994,7 @@ QDeclarativeListProperty<QObject> QDeclarativePropertyAction::targets() } /*! - \qmlproperty list<Object> PropertyAction::exclude + \qmlproperty list<Object> QtQuick2::PropertyAction::exclude This property holds the objects that should not be affected by this action. \sa targets @@ -1006,7 +1006,7 @@ QDeclarativeListProperty<QObject> QDeclarativePropertyAction::exclude() } /*! - \qmlproperty any PropertyAction::value + \qmlproperty any QtQuick2::PropertyAction::value This property holds the value to be set on the property. If the PropertyAction is defined within a \l Transition or \l Behavior, @@ -1132,8 +1132,8 @@ void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions, /*! \qmlclass NumberAnimation QDeclarativeNumberAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits PropertyAnimation \brief The NumberAnimation element animates changes in qreal-type values. @@ -1181,7 +1181,7 @@ void QDeclarativeNumberAnimation::init() } /*! - \qmlproperty real NumberAnimation::from + \qmlproperty real QtQuick2::NumberAnimation::from This property holds the starting value for the animation. For example, the following animation is not applied until the \c x value @@ -1219,7 +1219,7 @@ void QDeclarativeNumberAnimation::setFrom(qreal f) } /*! - \qmlproperty real NumberAnimation::to + \qmlproperty real QtQuick2::NumberAnimation::to This property holds the end value for the animation. If the NumberAnimation is defined within a \l Transition or \l Behavior, @@ -1244,8 +1244,8 @@ void QDeclarativeNumberAnimation::setTo(qreal t) /*! \qmlclass Vector3dAnimation QDeclarativeVector3dAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits PropertyAnimation \brief The Vector3dAnimation element animates changes in QVector3d values. @@ -1273,7 +1273,7 @@ QDeclarativeVector3dAnimation::~QDeclarativeVector3dAnimation() } /*! - \qmlproperty real Vector3dAnimation::from + \qmlproperty real QtQuick2::Vector3dAnimation::from This property holds the starting value for the animation. If the Vector3dAnimation is defined within a \l Transition or \l Behavior, @@ -1295,7 +1295,7 @@ void QDeclarativeVector3dAnimation::setFrom(QVector3D f) } /*! - \qmlproperty real Vector3dAnimation::to + \qmlproperty real QtQuick2::Vector3dAnimation::to This property holds the end value for the animation. If the Vector3dAnimation is defined within a \l Transition or \l Behavior, @@ -1320,8 +1320,8 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t) /*! \qmlclass RotationAnimation QDeclarativeRotationAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits PropertyAnimation \brief The RotationAnimation element animates changes in rotation values. @@ -1409,7 +1409,7 @@ QDeclarativeRotationAnimation::~QDeclarativeRotationAnimation() } /*! - \qmlproperty real RotationAnimation::from + \qmlproperty real QtQuick2::RotationAnimation::from This property holds the starting value for the animation. For example, the following animation is not applied until the \c angle value @@ -1446,7 +1446,7 @@ void QDeclarativeRotationAnimation::setFrom(qreal f) } /*! - \qmlproperty real RotationAnimation::to + \qmlproperty real QtQuick2::RotationAnimation::to This property holds the end value for the animation.. If the RotationAnimation is defined within a \l Transition or \l Behavior, @@ -1468,7 +1468,7 @@ void QDeclarativeRotationAnimation::setTo(qreal t) } /*! - \qmlproperty enumeration RotationAnimation::direction + \qmlproperty enumeration QtQuick2::RotationAnimation::direction This property holds the direction of the rotation. Possible values are: @@ -1564,8 +1564,8 @@ QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeAnimationGro /*! \qmlclass SequentialAnimation QDeclarativeSequentialAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits Animation \brief The SequentialAnimation element allows animations to be run sequentially. @@ -1638,8 +1638,8 @@ void QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actio /*! \qmlclass ParallelAnimation QDeclarativeParallelAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits Animation \brief The ParallelAnimation element allows animations to be run in parallel. @@ -1752,8 +1752,8 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int /*! \qmlclass PropertyAnimation QDeclarativePropertyAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits Animation \brief The PropertyAnimation element animates changes in property values. @@ -1838,7 +1838,7 @@ void QDeclarativePropertyAnimationPrivate::init() } /*! - \qmlproperty int PropertyAnimation::duration + \qmlproperty int QtQuick2::PropertyAnimation::duration This property holds the duration of the animation, in milliseconds. The default value is 250. @@ -1864,7 +1864,7 @@ void QDeclarativePropertyAnimation::setDuration(int duration) } /*! - \qmlproperty real PropertyAnimation::from + \qmlproperty real QtQuick2::PropertyAnimation::from This property holds the starting value for the animation. If the PropertyAnimation is defined within a \l Transition or \l Behavior, @@ -1891,7 +1891,7 @@ void QDeclarativePropertyAnimation::setFrom(const QVariant &f) } /*! - \qmlproperty real PropertyAnimation::to + \qmlproperty real QtQuick2::PropertyAnimation::to This property holds the end value for the animation. If the PropertyAnimation is defined within a \l Transition or \l Behavior, @@ -1918,10 +1918,10 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t) } /*! - \qmlproperty enumeration PropertyAnimation::easing.type - \qmlproperty real PropertyAnimation::easing.amplitude - \qmlproperty real PropertyAnimation::easing.overshoot - \qmlproperty real PropertyAnimation::easing.period + \qmlproperty enumeration QtQuick2::PropertyAnimation::easing.type + \qmlproperty real QtQuick2::PropertyAnimation::easing.amplitude + \qmlproperty real QtQuick2::PropertyAnimation::easing.overshoot + \qmlproperty real QtQuick2::PropertyAnimation::easing.period \brief the easing curve used for the animation. To specify an easing curve you need to specify at least the type. For some curves you can also specify @@ -2179,10 +2179,10 @@ void QDeclarativePropertyAnimation::setProperties(const QString &prop) } /*! - \qmlproperty string PropertyAnimation::properties - \qmlproperty list<Object> PropertyAnimation::targets - \qmlproperty string PropertyAnimation::property - \qmlproperty Object PropertyAnimation::target + \qmlproperty string QtQuick2::PropertyAnimation::properties + \qmlproperty list<Object> QtQuick2::PropertyAnimation::targets + \qmlproperty string QtQuick2::PropertyAnimation::property + \qmlproperty Object QtQuick2::PropertyAnimation::target These properties are used as a set to determine which properties should be animated. The singular and plural forms are functionally identical, e.g. @@ -2275,7 +2275,7 @@ QDeclarativeListProperty<QObject> QDeclarativePropertyAnimation::targets() } /*! - \qmlproperty list<Object> PropertyAnimation::exclude + \qmlproperty list<Object> QtQuick2::PropertyAnimation::exclude This property holds the items not to be affected by this animation. \sa PropertyAnimation::targets */ diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index 8587ccb4fb..84636e4701 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -72,8 +72,8 @@ public: /*! \qmlclass Behavior QDeclarativeBehavior + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \brief The Behavior element allows you to specify a default animation for a property change. A Behavior defines the default animation to be applied whenever a @@ -108,7 +108,7 @@ QDeclarativeBehavior::~QDeclarativeBehavior() } /*! - \qmlproperty Animation Behavior::animation + \qmlproperty Animation QtQuick2::Behavior::animation \default This property holds the animation to run when the behavior is triggered. @@ -149,7 +149,7 @@ void QDeclarativeBehavior::qtAnimationStateChanged(QAbstractAnimation::State new /*! - \qmlproperty bool Behavior::enabled + \qmlproperty bool QtQuick2::Behavior::enabled This property holds whether the behavior will be triggered when the tracked property changes value. diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp index 320bca853a..ba120b959a 100644 --- a/src/declarative/util/qdeclarativebind.cpp +++ b/src/declarative/util/qdeclarativebind.cpp @@ -78,8 +78,8 @@ public: /*! \qmlclass Binding QDeclarativeBind + \inqmlmodule QtQuick 2 \ingroup qml-working-with-data - \since 4.7 \brief The Binding element allows arbitrary property bindings to be created. \section1 Binding to an inaccessible property @@ -152,7 +152,7 @@ QDeclarativeBind::~QDeclarativeBind() } /*! - \qmlproperty bool Binding::when + \qmlproperty bool QtQuick2::Binding::when This property holds when the binding is active. This should be set to an expression that evaluates to true when you want the binding to be active. @@ -184,7 +184,7 @@ void QDeclarativeBind::setWhen(bool v) } /*! - \qmlproperty Object Binding::target + \qmlproperty Object QtQuick2::Binding::target The object to be updated. */ @@ -211,7 +211,7 @@ void QDeclarativeBind::setObject(QObject *obj) } /*! - \qmlproperty string Binding::property + \qmlproperty string QtQuick2::Binding::property The property to be updated. */ @@ -238,7 +238,7 @@ void QDeclarativeBind::setProperty(const QString &p) } /*! - \qmlproperty any Binding::value + \qmlproperty any QtQuick2::Binding::value The value to be set on the target object and property. This can be a constant (which isn't very useful), or a bound expression. diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp index 956533f7ca..6559d4bb20 100644 --- a/src/declarative/util/qdeclarativeconnections.cpp +++ b/src/declarative/util/qdeclarativeconnections.cpp @@ -72,8 +72,8 @@ public: /*! \qmlclass Connections QDeclarativeConnections + \inqmlmodule QtQuick 2 \ingroup qml-utility-elements - \since 4.7 \brief A Connections element describes generalized connections to signals. A Connections object creates a connection to a QML signal. @@ -137,7 +137,7 @@ QDeclarativeConnections::~QDeclarativeConnections() } /*! - \qmlproperty Object Connections::target + \qmlproperty Object QtQuick2::Connections::target This property holds the object that sends the signal. If this property is not set, the \c target defaults to the parent of the Connection. @@ -172,7 +172,7 @@ void QDeclarativeConnections::setTarget(QObject *obj) } /*! - \qmlproperty bool Connections::ignoreUnknownSignals + \qmlproperty bool QtQuick2::Connections::ignoreUnknownSignals Normally, a connection to a non-existent signal produces runtime errors. diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index 4d67736e0c..7a1dec88f0 100644 --- a/src/declarative/util/qdeclarativefontloader.cpp +++ b/src/declarative/util/qdeclarativefontloader.cpp @@ -145,8 +145,8 @@ QHash<QUrl, QDeclarativeFontObject*> QDeclarativeFontLoaderPrivate::fonts; /*! \qmlclass FontLoader QDeclarativeFontLoader + \inqmlmodule QtQuick 2 \ingroup qml-utility-elements - \since 4.7 \brief The FontLoader element allows fonts to be loaded by name or URL. The FontLoader element is used to load fonts by name or URL. @@ -179,7 +179,7 @@ QDeclarativeFontLoader::~QDeclarativeFontLoader() } /*! - \qmlproperty url FontLoader::source + \qmlproperty url QtQuick2::FontLoader::source The url of the font to load. */ QUrl QDeclarativeFontLoader::source() const @@ -253,7 +253,7 @@ void QDeclarativeFontLoader::updateFontInfo(const QString& name, QDeclarativeFon } /*! - \qmlproperty string FontLoader::name + \qmlproperty string QtQuick2::FontLoader::name This property holds the name of the font family. It is set automatically when a font is loaded using the \c url property. @@ -294,7 +294,7 @@ void QDeclarativeFontLoader::setName(const QString &name) } /*! - \qmlproperty enumeration FontLoader::status + \qmlproperty enumeration QtQuick2::FontLoader::status This property holds the status of font loading. It can be one of: \list diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 035502140b..15d87c828d 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -204,8 +204,8 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM /*! \qmlclass ListModel QDeclarativeListModel + \inqmlmodule QtQuick 2 \ingroup qml-working-with-data - \since 4.7 \brief The ListModel element defines a free-form list data source. The ListModel is a simple container of ListElement definitions, each containing data roles. @@ -436,7 +436,7 @@ QVariant QDeclarativeListModel::data(int index, int role) const } /*! - \qmlproperty int ListModel::count + \qmlproperty int QtQuick2::ListModel::count The number of data entries in the model. */ int QDeclarativeListModel::count() const @@ -445,7 +445,7 @@ int QDeclarativeListModel::count() const } /*! - \qmlmethod ListModel::clear() + \qmlmethod QtQuick2::ListModel::clear() Deletes all content from the model. @@ -498,7 +498,7 @@ ModelObject *ModelNode::object(const NestedListModel *model) } /*! - \qmlmethod ListModel::remove(int index) + \qmlmethod QtQuick2::ListModel::remove(int index) Deletes the content at \a index from the model. @@ -523,7 +523,7 @@ void QDeclarativeListModel::remove(int index) } /*! - \qmlmethod ListModel::insert(int index, jsobject dict) + \qmlmethod QtQuick2::ListModel::insert(int index, jsobject dict) Adds a new item to the list model at position \a index, with the values in \a dict. @@ -560,7 +560,7 @@ void QDeclarativeListModel::insert(int index, const QDeclarativeV8Handle &handle } /*! - \qmlmethod ListModel::move(int from, int to, int n) + \qmlmethod QtQuick2::ListModel::move(int from, int to, int n) Moves \a n items \a from one position \a to another. @@ -604,7 +604,7 @@ void QDeclarativeListModel::move(int from, int to, int n) } /*! - \qmlmethod ListModel::append(jsobject dict) + \qmlmethod QtQuick2::ListModel::append(jsobject dict) Adds a new item to the end of the list model, with the values in \a dict. @@ -628,7 +628,7 @@ void QDeclarativeListModel::append(const QDeclarativeV8Handle &handle) } /*! - \qmlmethod object ListModel::get(int index) + \qmlmethod object QtQuick2::ListModel::get(int index) Returns the item at \a index in the list model. This allows the item data to be accessed or modified from JavaScript: @@ -665,7 +665,7 @@ QDeclarativeV8Handle QDeclarativeListModel::get(int index) const } /*! - \qmlmethod ListModel::set(int index, jsobject dict) + \qmlmethod QtQuick2::ListModel::set(int index, jsobject dict) Changes the item at \a index in the list model with the values in \a dict. Properties not appearing in \a dict @@ -712,7 +712,7 @@ void QDeclarativeListModel::set(int index, const QDeclarativeV8Handle &handle, Q } /*! - \qmlmethod ListModel::setProperty(int index, string property, variant value) + \qmlmethod QtQuick2::ListModel::setProperty(int index, string property, variant value) Changes the \a property of the item at \a index in the list model to \a value. @@ -746,7 +746,7 @@ void QDeclarativeListModel::setProperty(int index, const QString& property, cons } /*! - \qmlmethod ListModel::sync() + \qmlmethod QtQuick2::ListModel::sync() Writes any unsaved changes to the list model after it has been modified from a worker script. @@ -1019,8 +1019,8 @@ bool QDeclarativeListModelParser::definesEmptyList(const QString &s) /*! \qmlclass ListElement QDeclarativeListElement + \inqmlmodule QtQuick 2 \ingroup qml-working-with-data - \since 4.7 \brief The ListElement element defines a data item in a ListModel. List elements are defined inside ListModel definitions, and represent items in a diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp index 2f96b3c6da..915633f1ad 100644 --- a/src/declarative/util/qdeclarativepackage.cpp +++ b/src/declarative/util/qdeclarativepackage.cpp @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Package QDeclarativePackage + \inqmlmodule QtQuick 2 \ingroup qml-working-with-data \brief Package provides a collection of named items. diff --git a/src/declarative/util/qdeclarativepath.cpp b/src/declarative/util/qdeclarativepath.cpp index 7b5d966719..34752b5242 100644 --- a/src/declarative/util/qdeclarativepath.cpp +++ b/src/declarative/util/qdeclarativepath.cpp @@ -53,8 +53,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass PathElement QDeclarativePathElement + \inqmlmodule QtQuick 2 \ingroup qml-view-elements - \since 4.7 \brief PathElement is the base path type. This type is the base for all path types. It cannot @@ -65,8 +65,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Path QDeclarativePath + \inqmlmodule QtQuick 2 \ingroup qml-view-elements - \since 4.7 \brief A Path object defines a path for use by \l PathView. A Path is composed of one or more path segments - PathLine, PathQuad, @@ -90,8 +90,8 @@ QDeclarativePath::~QDeclarativePath() } /*! - \qmlproperty real Path::startX - \qmlproperty real Path::startY + \qmlproperty real QtQuick2::Path::startX + \qmlproperty real QtQuick2::Path::startY These properties hold the starting position of the path. */ qreal QDeclarativePath::startX() const @@ -127,7 +127,7 @@ void QDeclarativePath::setStartY(qreal y) } /*! - \qmlproperty bool Path::closed + \qmlproperty bool QtQuick2::Path::closed This property holds whether the start and end of the path are identical. */ bool QDeclarativePath::isClosed() const @@ -137,7 +137,7 @@ bool QDeclarativePath::isClosed() const } /*! - \qmlproperty list<PathElement> Path::pathElements + \qmlproperty list<PathElement> QtQuick2::Path::pathElements This property holds the objects composing the path. \default @@ -502,8 +502,8 @@ void QDeclarativeCurve::setY(qreal y) /*! \qmlclass PathAttribute QDeclarativePathAttribute + \inqmlmodule QtQuick 2 \ingroup qml-view-elements - \since 4.7 \brief The PathAttribute allows setting an attribute at a given position in a Path. The PathAttribute object allows attributes consisting of a name and @@ -533,7 +533,7 @@ void QDeclarativeCurve::setY(qreal y) */ /*! - \qmlproperty string PathAttribute::name + \qmlproperty string QtQuick2::PathAttribute::name This property holds the name of the attribute to change. This attribute will be available to the delegate as PathView.<name> @@ -562,7 +562,7 @@ void QDeclarativePathAttribute::setName(const QString &name) } /*! - \qmlproperty real PathAttribute::value + \qmlproperty real QtQuick2::PathAttribute::value This property holds the value for the attribute. The value specified can be used to influence the visual appearance @@ -618,8 +618,8 @@ void QDeclarativePathAttribute::setValue(qreal value) /*! \qmlclass PathLine QDeclarativePathLine + \inqmlmodule QtQuick 2 \ingroup qml-view-elements - \since 4.7 \brief The PathLine defines a straight line. The example below creates a path consisting of a straight line from @@ -636,8 +636,8 @@ void QDeclarativePathAttribute::setValue(qreal value) */ /*! - \qmlproperty real PathLine::x - \qmlproperty real PathLine::y + \qmlproperty real QtQuick2::PathLine::x + \qmlproperty real QtQuick2::PathLine::y Defines the end point of the line. */ @@ -651,8 +651,8 @@ void QDeclarativePathLine::addToPath(QPainterPath &path) /*! \qmlclass PathQuad QDeclarativePathQuad + \inqmlmodule QtQuick 2 \ingroup qml-view-elements - \since 4.7 \brief The PathQuad defines a quadratic Bezier curve with a control point. The following QML produces the path shown below: @@ -672,15 +672,15 @@ void QDeclarativePathLine::addToPath(QPainterPath &path) */ /*! - \qmlproperty real PathQuad::x - \qmlproperty real PathQuad::y + \qmlproperty real QtQuick2::PathQuad::x + \qmlproperty real QtQuick2::PathQuad::y Defines the end point of the curve. */ /*! - \qmlproperty real PathQuad::controlX - \qmlproperty real PathQuad::controlY + \qmlproperty real QtQuick2::PathQuad::controlX + \qmlproperty real QtQuick2::PathQuad::controlY Defines the position of the control point. */ @@ -729,8 +729,8 @@ void QDeclarativePathQuad::addToPath(QPainterPath &path) /*! \qmlclass PathCubic QDeclarativePathCubic + \inqmlmodule QtQuick 2 \ingroup qml-view-elements - \since 4.7 \brief The PathCubic defines a cubic Bezier curve with two control points. The following QML produces the path shown below: @@ -754,15 +754,15 @@ void QDeclarativePathQuad::addToPath(QPainterPath &path) */ /*! - \qmlproperty real PathCubic::x - \qmlproperty real PathCubic::y + \qmlproperty real QtQuick2::PathCubic::x + \qmlproperty real QtQuick2::PathCubic::y Defines the end point of the curve. */ /*! - \qmlproperty real PathCubic::control1X - \qmlproperty real PathCubic::control1Y + \qmlproperty real QtQuick2::PathCubic::control1X + \qmlproperty real QtQuick2::PathCubic::control1Y Defines the position of the first control point. */ @@ -795,8 +795,8 @@ void QDeclarativePathCubic::setControl1Y(qreal y) } /*! - \qmlproperty real PathCubic::control2X - \qmlproperty real PathCubic::control2Y + \qmlproperty real QtQuick2::PathCubic::control2X + \qmlproperty real QtQuick2::PathCubic::control2Y Defines the position of the second control point. */ @@ -837,8 +837,8 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path) /*! \qmlclass PathPercent QDeclarativePathPercent + \inqmlmodule QtQuick 2 \ingroup qml-view-elements - \since 4.7 \brief The PathPercent manipulates the way a path is interpreted. PathPercent allows you to manipulate the spacing between items on a @@ -886,7 +886,7 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path) */ /*! - \qmlproperty real PathPercent::value + \qmlproperty real QtQuick2::PathPercent::value The proporation of items that should be laid out up to this point. This value should always be higher than the last value specified diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 5cdf785ccd..d03cd3bb1a 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -65,8 +65,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass PropertyChanges QDeclarativePropertyChanges + \inqmlmodule QtQuick 2 \ingroup qml-state-elements - \since 4.7 \brief The PropertyChanges element describes new property bindings or values for a state. PropertyChanges is used to define the property values or bindings in a @@ -132,7 +132,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty Object PropertyChanges::target + \qmlproperty Object QtQuick2::PropertyChanges::target This property holds the object which contains the properties to be changed. */ @@ -394,7 +394,7 @@ void QDeclarativePropertyChanges::setObject(QObject *o) } /*! - \qmlproperty bool PropertyChanges::restoreEntryValues + \qmlproperty bool QtQuick2::PropertyChanges::restoreEntryValues This property holds whether the previous values should be restored when leaving the state. @@ -496,7 +496,7 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions() } /*! - \qmlproperty bool PropertyChanges::explicit + \qmlproperty bool QtQuick2::PropertyChanges::explicit If explicit is set to true, any potential bindings will be interpreted as once-off assignments that occur when the state is entered. diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp index 765e237051..c9242672c5 100644 --- a/src/declarative/util/qdeclarativepropertymap.cpp +++ b/src/declarative/util/qdeclarativepropertymap.cpp @@ -97,7 +97,6 @@ void QDeclarativePropertyMapMetaObject::propertyCreated(int, QMetaPropertyBuilde /*! \class QDeclarativePropertyMap - \since 4.7 \brief The QDeclarativePropertyMap class allows you to set key-value pairs that can be used in QML bindings. QDeclarativePropertyMap provides a convenient way to expose domain data to the UI layer. diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index 2200d2c77c..f76531a5f7 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -253,8 +253,8 @@ void QSmoothedAnimation::init() /*! \qmlclass SmoothedAnimation QDeclarativeSmoothedAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \inherits NumberAnimation \brief The SmoothedAnimation element allows a property to smoothly track a value. @@ -382,7 +382,7 @@ void QDeclarativeSmoothedAnimation::transition(QDeclarativeStateActions &actions } /*! - \qmlproperty enumeration SmoothedAnimation::reversingMode + \qmlproperty enumeration QtQuick2::SmoothedAnimation::reversingMode Sets how the SmoothedAnimation behaves if an animation direction is reversed. @@ -412,7 +412,7 @@ void QDeclarativeSmoothedAnimation::setReversingMode(ReversingMode m) } /*! - \qmlproperty int SmoothedAnimation::duration + \qmlproperty int QtQuick2::SmoothedAnimation::duration This property holds the animation duration, in msecs, used when tracking the source. @@ -445,7 +445,7 @@ qreal QDeclarativeSmoothedAnimation::velocity() const } /*! - \qmlproperty real SmoothedAnimation::velocity + \qmlproperty real QtQuick2::SmoothedAnimation::velocity This property holds the average velocity allowed when tracking the 'to' value. @@ -468,7 +468,7 @@ void QDeclarativeSmoothedAnimation::setVelocity(qreal v) } /*! - \qmlproperty int SmoothedAnimation::maximumEasingTime + \qmlproperty int QtQuick2::SmoothedAnimation::maximumEasingTime This property specifies the maximum time, in msecs, any "eases" during the follow should take. Setting this property causes the velocity to "level out" after at a time. Setting diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp index 2c6058caf6..619811f789 100644 --- a/src/declarative/util/qdeclarativespringanimation.cpp +++ b/src/declarative/util/qdeclarativespringanimation.cpp @@ -235,9 +235,9 @@ void QDeclarativeSpringAnimationPrivate::updateMode() /*! \qmlclass SpringAnimation QDeclarativeSpringAnimation + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition \inherits NumberAnimation - \since 4.7 \brief The SpringAnimation element allows a property to track a value in a spring-like motion. @@ -273,7 +273,7 @@ QDeclarativeSpringAnimation::~QDeclarativeSpringAnimation() } /*! - \qmlproperty real SpringAnimation::velocity + \qmlproperty real QtQuick2::SpringAnimation::velocity This property holds the maximum velocity allowed when tracking the source. @@ -295,7 +295,7 @@ void QDeclarativeSpringAnimation::setVelocity(qreal velocity) } /*! - \qmlproperty real SpringAnimation::spring + \qmlproperty real QtQuick2::SpringAnimation::spring This property describes how strongly the target is pulled towards the source. The default value is 0 (that is, the spring-like motion is disabled). @@ -319,7 +319,7 @@ void QDeclarativeSpringAnimation::setSpring(qreal spring) } /*! - \qmlproperty real SpringAnimation::damping + \qmlproperty real QtQuick2::SpringAnimation::damping This property holds the spring damping value. This value describes how quickly the spring-like motion comes to rest. @@ -345,7 +345,7 @@ void QDeclarativeSpringAnimation::setDamping(qreal damping) /*! - \qmlproperty real SpringAnimation::epsilon + \qmlproperty real QtQuick2::SpringAnimation::epsilon This property holds the spring epsilon. The epsilon is the rate and amount of change in the value which is close enough @@ -367,7 +367,7 @@ void QDeclarativeSpringAnimation::setEpsilon(qreal epsilon) } /*! - \qmlproperty real SpringAnimation::modulus + \qmlproperty real QtQuick2::SpringAnimation::modulus This property holds the modulus value. The default value is 0. Setting a \a modulus forces the target value to "wrap around" at the modulus. @@ -391,7 +391,7 @@ void QDeclarativeSpringAnimation::setModulus(qreal modulus) } /*! - \qmlproperty real SpringAnimation::mass + \qmlproperty real QtQuick2::SpringAnimation::mass This property holds the "mass" of the property being moved. The value is 1.0 by default. diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 9f56ccb02e..63cb95d7b1 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -130,8 +130,8 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje /*! \qmlclass State QDeclarativeState + \inqmlmodule QtQuick 2 \ingroup qml-state-elements - \since 4.7 \brief The State element defines configurations of objects and properties. A \e state is a set of batched changes from the default configuration. @@ -176,7 +176,7 @@ QDeclarativeState::~QDeclarativeState() } /*! - \qmlproperty string State::name + \qmlproperty string QtQuick2::State::name This property holds the name of the state. Each state should have a unique name within its item. @@ -207,7 +207,7 @@ bool QDeclarativeState::isWhenKnown() const } /*! - \qmlproperty bool State::when + \qmlproperty bool QtQuick2::State::when This property holds when the state should be applied. This should be set to an expression that evaluates to \c true when you want the state to @@ -245,7 +245,7 @@ void QDeclarativeState::setWhen(QDeclarativeBinding *when) } /*! - \qmlproperty string State::extend + \qmlproperty string QtQuick2::State::extend This property holds the state that this state extends. When a state extends another state, it inherits all the changes of that state. @@ -266,7 +266,7 @@ void QDeclarativeState::setExtends(const QString &extends) } /*! - \qmlproperty list<Change> State::changes + \qmlproperty list<Change> QtQuick2::State::changes This property holds the changes to apply for this state \default diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index 7200ac91af..df16c16fa2 100644 --- a/src/declarative/util/qdeclarativestategroup.cpp +++ b/src/declarative/util/qdeclarativestategroup.cpp @@ -93,8 +93,8 @@ public: /*! \qmlclass StateGroup QDeclarativeStateGroup + \inqmlmodule QtQuick 2 \ingroup qml-state-elements - \since 4.7 \brief The StateGroup element provides state support for non-Item elements. Item (and all derived elements) provides built in support for states and transitions @@ -140,7 +140,7 @@ QList<QDeclarativeState *> QDeclarativeStateGroup::states() const } /*! - \qmlproperty list<State> StateGroup::states + \qmlproperty list<State> QtQuick2::StateGroup::states This property holds a list of states defined by the state group. \qml @@ -201,7 +201,7 @@ void QDeclarativeStateGroupPrivate::clear_states(QDeclarativeListProperty<QDecla } /*! - \qmlproperty list<Transition> StateGroup::transitions + \qmlproperty list<Transition> QtQuick2::StateGroup::transitions This property holds a list of transitions defined by the state group. \qml @@ -255,7 +255,7 @@ void QDeclarativeStateGroupPrivate::clear_transitions(QDeclarativeListProperty<Q } /*! - \qmlproperty string StateGroup::state + \qmlproperty string QtQuick2::StateGroup::state This property holds the name of the current state of the state group. diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 0ced8ebd61..6ac21002a5 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -71,6 +71,7 @@ public: /*! \qmlclass StateChangeScript QDeclarativeStateChangeScript + \inqmlmodule QtQuick 2 \ingroup qml-state-elements \brief The StateChangeScript element allows you to run a script in a state. @@ -93,7 +94,7 @@ QDeclarativeStateChangeScript::~QDeclarativeStateChangeScript() } /*! - \qmlproperty script StateChangeScript::script + \qmlproperty script QtQuick2::StateChangeScript::script This property holds the script to run when the state is current. */ QDeclarativeScriptString QDeclarativeStateChangeScript::script() const @@ -109,7 +110,7 @@ void QDeclarativeStateChangeScript::setScript(const QDeclarativeScriptString &s) } /*! - \qmlproperty string StateChangeScript::name + \qmlproperty string QtQuick2::StateChangeScript::name This property holds the name of the script. This name can be used by a ScriptAction to target a specific script. diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp index 3fe2e81df4..7c5a535935 100644 --- a/src/declarative/util/qdeclarativesystempalette.cpp +++ b/src/declarative/util/qdeclarativesystempalette.cpp @@ -58,8 +58,8 @@ public: /*! \qmlclass SystemPalette QDeclarativeSystemPalette + \inqmlmodule QtQuick 2 \ingroup qml-utility-elements - \since 4.7 \brief The SystemPalette element provides access to the Qt palettes. The SystemPalette element provides access to the Qt application @@ -94,7 +94,7 @@ QDeclarativeSystemPalette::~QDeclarativeSystemPalette() } /*! - \qmlproperty color SystemPalette::window + \qmlproperty color QtQuick2::SystemPalette::window The window (general background) color of the current color group. \sa QPalette::ColorRole @@ -106,7 +106,7 @@ QColor QDeclarativeSystemPalette::window() const } /*! - \qmlproperty color SystemPalette::windowText + \qmlproperty color QtQuick2::SystemPalette::windowText The window text (general foreground) color of the current color group. \sa QPalette::ColorRole @@ -118,7 +118,7 @@ QColor QDeclarativeSystemPalette::windowText() const } /*! - \qmlproperty color SystemPalette::base + \qmlproperty color QtQuick2::SystemPalette::base The base color of the current color group. \sa QPalette::ColorRole @@ -130,7 +130,7 @@ QColor QDeclarativeSystemPalette::base() const } /*! - \qmlproperty color SystemPalette::text + \qmlproperty color QtQuick2::SystemPalette::text The text color of the current color group. \sa QPalette::ColorRole @@ -142,7 +142,7 @@ QColor QDeclarativeSystemPalette::text() const } /*! - \qmlproperty color SystemPalette::alternateBase + \qmlproperty color QtQuick2::SystemPalette::alternateBase The alternate base color of the current color group. \sa QPalette::ColorRole @@ -154,7 +154,7 @@ QColor QDeclarativeSystemPalette::alternateBase() const } /*! - \qmlproperty color SystemPalette::button + \qmlproperty color QtQuick2::SystemPalette::button The button color of the current color group. \sa QPalette::ColorRole @@ -166,7 +166,7 @@ QColor QDeclarativeSystemPalette::button() const } /*! - \qmlproperty color SystemPalette::buttonText + \qmlproperty color QtQuick2::SystemPalette::buttonText The button text foreground color of the current color group. \sa QPalette::ColorRole @@ -178,7 +178,7 @@ QColor QDeclarativeSystemPalette::buttonText() const } /*! - \qmlproperty color SystemPalette::light + \qmlproperty color QtQuick2::SystemPalette::light The light color of the current color group. \sa QPalette::ColorRole @@ -190,7 +190,7 @@ QColor QDeclarativeSystemPalette::light() const } /*! - \qmlproperty color SystemPalette::midlight + \qmlproperty color QtQuick2::SystemPalette::midlight The midlight color of the current color group. \sa QPalette::ColorRole @@ -202,7 +202,7 @@ QColor QDeclarativeSystemPalette::midlight() const } /*! - \qmlproperty color SystemPalette::dark + \qmlproperty color QtQuick2::SystemPalette::dark The dark color of the current color group. \sa QPalette::ColorRole @@ -214,7 +214,7 @@ QColor QDeclarativeSystemPalette::dark() const } /*! - \qmlproperty color SystemPalette::mid + \qmlproperty color QtQuick2::SystemPalette::mid The mid color of the current color group. \sa QPalette::ColorRole @@ -226,7 +226,7 @@ QColor QDeclarativeSystemPalette::mid() const } /*! - \qmlproperty color SystemPalette::shadow + \qmlproperty color QtQuick2::SystemPalette::shadow The shadow color of the current color group. \sa QPalette::ColorRole @@ -238,7 +238,7 @@ QColor QDeclarativeSystemPalette::shadow() const } /*! - \qmlproperty color SystemPalette::highlight + \qmlproperty color QtQuick2::SystemPalette::highlight The highlight color of the current color group. \sa QPalette::ColorRole @@ -250,7 +250,7 @@ QColor QDeclarativeSystemPalette::highlight() const } /*! - \qmlproperty color SystemPalette::highlightedText + \qmlproperty color QtQuick2::SystemPalette::highlightedText The highlighted text color of the current color group. \sa QPalette::ColorRole @@ -262,7 +262,7 @@ QColor QDeclarativeSystemPalette::highlightedText() const } /*! - \qmlproperty enumeration SystemPalette::colorGroup + \qmlproperty enumeration QtQuick2::SystemPalette::colorGroup The color group of the palette. This can be one of: diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp index de3e6ce44d..de37f60bf5 100644 --- a/src/declarative/util/qdeclarativetimer.cpp +++ b/src/declarative/util/qdeclarativetimer.cpp @@ -70,8 +70,8 @@ public: /*! \qmlclass Timer QDeclarativeTimer + \inqmlmodule QtQuick 2 \ingroup qml-utility-elements - \since 4.7 \brief The Timer item triggers a handler at a specified interval. A Timer can be used to trigger an action either once, or repeatedly @@ -118,7 +118,7 @@ QDeclarativeTimer::QDeclarativeTimer(QObject *parent) } /*! - \qmlproperty int Timer::interval + \qmlproperty int QtQuick2::Timer::interval Sets the \a interval between triggers, in milliseconds. @@ -141,7 +141,7 @@ int QDeclarativeTimer::interval() const } /*! - \qmlproperty bool Timer::running + \qmlproperty bool QtQuick2::Timer::running If set to true, starts the timer; otherwise stops the timer. For a non-repeating timer, \a running is set to false after the @@ -169,7 +169,7 @@ void QDeclarativeTimer::setRunning(bool running) } /*! - \qmlproperty bool Timer::repeat + \qmlproperty bool QtQuick2::Timer::repeat If \a repeat is true the timer is triggered repeatedly at the specified interval; otherwise, the timer will trigger once at the @@ -196,7 +196,7 @@ void QDeclarativeTimer::setRepeating(bool repeating) } /*! - \qmlproperty bool Timer::triggeredOnStart + \qmlproperty bool QtQuick2::Timer::triggeredOnStart When a timer is started, the first trigger is usually after the specified interval has elapsed. It is sometimes desirable to trigger immediately @@ -229,7 +229,7 @@ void QDeclarativeTimer::setTriggeredOnStart(bool triggeredOnStart) } /*! - \qmlmethod Timer::start() + \qmlmethod QtQuick2::Timer::start() \brief Starts the timer. If the timer is already running, calling this method has no effect. The @@ -241,7 +241,7 @@ void QDeclarativeTimer::start() } /*! - \qmlmethod Timer::stop() + \qmlmethod QtQuick2::Timer::stop() \brief Stops the timer. If the timer is not running, calling this method has no effect. The @@ -253,7 +253,7 @@ void QDeclarativeTimer::stop() } /*! - \qmlmethod Timer::restart() + \qmlmethod QtQuick2::Timer::restart() \brief Restarts the timer. If the Timer is not running it will be started, otherwise it will be @@ -298,7 +298,7 @@ void QDeclarativeTimer::componentComplete() } /*! - \qmlsignal Timer::onTriggered() + \qmlsignal QtQuick2::Timer::onTriggered() This handler is called when the Timer is triggered. */ diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index e3af6b724f..5351f8a5c9 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -53,8 +53,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Transition QDeclarativeTransition + \inqmlmodule QtQuick 2 \ingroup qml-animation-transition - \since 4.7 \brief The Transition element defines animated transitions that occur on state changes. A Transition defines the animations to be applied when a \l State change occurs. @@ -225,8 +225,8 @@ void QDeclarativeTransition::prepare(QDeclarativeStateOperation::ActionList &act } /*! - \qmlproperty string Transition::from - \qmlproperty string Transition::to + \qmlproperty string QtQuick2::Transition::from + \qmlproperty string QtQuick2::Transition::to These properties indicate the state changes that trigger the transition. @@ -266,7 +266,7 @@ void QDeclarativeTransition::setFromState(const QString &f) } /*! - \qmlproperty bool Transition::reversible + \qmlproperty bool QtQuick2::Transition::reversible This property holds whether the transition should be automatically reversed when the conditions that triggered this transition are reversed. The default value is false. @@ -322,7 +322,7 @@ void QDeclarativeTransition::setToState(const QString &t) } /*! - \qmlproperty bool Transition::enabled + \qmlproperty bool QtQuick2::Transition::enabled This property holds whether the Transition will be run when moving from the \c from state to the \c to state. @@ -365,7 +365,7 @@ void QDeclarativeTransition::setEnabled(bool enabled) } /*! - \qmlproperty list<Animation> Transition::animations + \qmlproperty list<Animation> QtQuick2::Transition::animations \default This property holds a list of the animations to be run for this transition. diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 6b0edc00fc..7ac6c7679e 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -71,15 +71,15 @@ typedef QPair<int, int> QDeclarativeXmlListRange; /*! \qmlclass XmlRole QDeclarativeXmlListModelRole + \inqmlmodule QtQuick 2 \ingroup qml-working-with-data - \since 4.7 \brief The XmlRole element allows you to specify a role for an XmlListModel. \sa {QtDeclarative} */ /*! - \qmlproperty string XmlRole::name + \qmlproperty string QtQuick2::XmlRole::name The name for the role. This name is used to access the model data for this role. @@ -106,7 +106,7 @@ typedef QPair<int, int> QDeclarativeXmlListRange; */ /*! - \qmlproperty string XmlRole::query + \qmlproperty string QtQuick2::XmlRole::query The relative XPath expression query for this role. The query must be relative; it cannot start with a '/'. @@ -124,7 +124,7 @@ typedef QPair<int, int> QDeclarativeXmlListRange; */ /*! - \qmlproperty bool XmlRole::isKey + \qmlproperty bool QtQuick2::XmlRole::isKey Defines whether this is a key role. Key roles are used to to determine whether a set of values should @@ -597,8 +597,8 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecla /*! \qmlclass XmlListModel QDeclarativeXmlListModel + \inqmlmodule QtQuick 2 \ingroup qml-working-with-data - \since 4.7 \brief The XmlListModel element is used to specify a read-only model using XPath expressions. XmlListModel is used to create a read-only model from XML data. It can be used as a data source @@ -702,7 +702,7 @@ QDeclarativeXmlListModel::~QDeclarativeXmlListModel() } /*! - \qmlproperty list<XmlRole> XmlListModel::roles + \qmlproperty list<XmlRole> QtQuick2::XmlListModel::roles The roles to make available for this model. */ @@ -735,7 +735,7 @@ QVariant QDeclarativeXmlListModel::data(int index, int role) const } /*! - \qmlproperty int XmlListModel::count + \qmlproperty int QtQuick2::XmlListModel::count The number of data entries in the model. */ int QDeclarativeXmlListModel::count() const @@ -760,7 +760,7 @@ QString QDeclarativeXmlListModel::toString(int role) const } /*! - \qmlproperty url XmlListModel::source + \qmlproperty url QtQuick2::XmlListModel::source The location of the XML data source. If both \c source and \l xml are set, \l xml is used. @@ -783,7 +783,7 @@ void QDeclarativeXmlListModel::setSource(const QUrl &src) } /*! - \qmlproperty string XmlListModel::xml + \qmlproperty string QtQuick2::XmlListModel::xml This property holds the XML data for this model, if set. The text is assumed to be UTF-8 encoded. @@ -807,7 +807,7 @@ void QDeclarativeXmlListModel::setXml(const QString &xml) } /*! - \qmlproperty string XmlListModel::query + \qmlproperty string QtQuick2::XmlListModel::query An absolute XPath query representing the base query for creating model items from this model's XmlRole objects. The query should start with '/' or '//'. */ @@ -833,7 +833,7 @@ void QDeclarativeXmlListModel::setQuery(const QString &query) } /*! - \qmlproperty string XmlListModel::namespaceDeclarations + \qmlproperty string QtQuick2::XmlListModel::namespaceDeclarations The namespace declarations to be used in the XPath queries. The namespaces should be declared as in XQuery. For example, if a requested document @@ -867,7 +867,7 @@ void QDeclarativeXmlListModel::setNamespaceDeclarations(const QString &declarati } /*! - \qmlmethod object XmlListModel::get(int index) + \qmlmethod object QtQuick2::XmlListModel::get(int index) Returns the item at \a index in the model. @@ -907,7 +907,7 @@ QDeclarativeV8Handle QDeclarativeXmlListModel::get(int index) const } /*! - \qmlproperty enumeration XmlListModel::status + \qmlproperty enumeration QtQuick2::XmlListModel::status Specifies the model loading status, which can be one of the following: \list @@ -928,7 +928,7 @@ QDeclarativeXmlListModel::Status QDeclarativeXmlListModel::status() const } /*! - \qmlproperty real XmlListModel::progress + \qmlproperty real QtQuick2::XmlListModel::progress This indicates the current progress of the downloading of the XML data source. This value ranges from 0.0 (no data downloaded) to @@ -949,7 +949,7 @@ qreal QDeclarativeXmlListModel::progress() const } /*! - \qmlmethod void XmlListModel::errorString() + \qmlmethod void QtQuick2::XmlListModel::errorString() Returns a string description of the last error that occurred if \l status is XmlListModel::Error. @@ -980,7 +980,7 @@ void QDeclarativeXmlListModel::componentComplete() } /*! - \qmlmethod XmlListModel::reload() + \qmlmethod QtQuick2::XmlListModel::reload() Reloads the model. diff --git a/src/declarative/util/qlistmodelinterface.cpp b/src/declarative/util/qlistmodelinterface.cpp index 17fce99f15..56fc8eeb51 100644 --- a/src/declarative/util/qlistmodelinterface.cpp +++ b/src/declarative/util/qlistmodelinterface.cpp @@ -46,7 +46,6 @@ QT_BEGIN_NAMESPACE /*! \internal \class QListModelInterface - \since 4.7 \brief The QListModelInterface class can be subclassed to provide C++ models to QDeclarativeGraphics Views This class is comprised primarily of pure virtual functions which |