summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-26 08:43:43 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-26 08:43:43 (GMT)
commit84fd26983a40ecae3e761106aa8f550c3b7fd7ba (patch)
tree9923adc01e1fa3767132db16b644f64e06c9b1f7
parenta498d551c701edb619de3639eda30e96b4da6afc (diff)
downloadQt-84fd26983a40ecae3e761106aa8f550c3b7fd7ba.zip
Qt-84fd26983a40ecae3e761106aa8f550c3b7fd7ba.tar.gz
Qt-84fd26983a40ecae3e761106aa8f550c3b7fd7ba.tar.bz2
doc: Added \since 4.7 to several \qmlclass elements.
-rw-r--r--src/declarative/graphicsitems/qmlgraphicseffects.cpp4
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsevents.cpp1
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsflickable.cpp1
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsgridview.cpp1
-rw-r--r--src/declarative/qml/qmlscript.cpp1
-rw-r--r--src/declarative/util/qmlanimation.cpp23
-rw-r--r--src/declarative/util/qmlbehavior.cpp1
-rw-r--r--src/declarative/util/qmleasefollow.cpp1
-rw-r--r--src/declarative/util/qmlfontloader.cpp1
-rw-r--r--src/declarative/util/qmllistmodel.cpp2
-rw-r--r--src/declarative/util/qmlspringfollow.cpp1
-rw-r--r--src/declarative/util/qmlstategroup.cpp1
-rw-r--r--src/declarative/util/qmlstateoperations.cpp3
-rw-r--r--src/declarative/util/qmlsystempalette.cpp1
-rw-r--r--src/declarative/util/qmltimer.cpp1
-rw-r--r--src/multimedia/qml/qmlaudio.cpp1
-rw-r--r--src/multimedia/qml/qmlgraphicsvideo.cpp1
-rw-r--r--src/multimedia/qml/qsoundeffect.cpp1
-rw-r--r--tools/qdoc3/node.cpp8
-rw-r--r--tools/qdoc3/node.h2
20 files changed, 44 insertions, 12 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicseffects.cpp b/src/declarative/graphicsitems/qmlgraphicseffects.cpp
index 6a93b12..8cd4e6f 100644
--- a/src/declarative/graphicsitems/qmlgraphicseffects.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicseffects.cpp
@@ -45,6 +45,7 @@
/*!
\qmlclass Blur QGraphicsBlurEffect
+ \since 4.7
\brief The Blur object provides a blur effect.
A blur effect blurs the source item. This effect is useful for reducing details;
@@ -80,6 +81,7 @@
/*!
\qmlclass Colorize QGraphicsColorizeEffect
+ \since 4.7
\brief The Colorize object provides a colorize effect.
A colorize effect renders the source item with a tint of its color.
@@ -106,6 +108,7 @@
/*!
\qmlclass DropShadow QGraphicsDropShadowEffect
+ \since 4.7
\brief The DropShadow object provides a drop shadow effect.
A drop shadow effect renders the source item with a drop shadow. The color of
@@ -147,6 +150,7 @@
/*!
\qmlclass Opacity QGraphicsOpacityEffect
+ \since 4.7
\brief The Opacity object provides an opacity effect.
An opacity effect renders the source with an opacity. This effect is useful
diff --git a/src/declarative/graphicsitems/qmlgraphicsevents.cpp b/src/declarative/graphicsitems/qmlgraphicsevents.cpp
index e8ba885..1fb5cd0 100644
--- a/src/declarative/graphicsitems/qmlgraphicsevents.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsevents.cpp
@@ -114,6 +114,7 @@ Item {
/*!
\qmlclass MouseEvent QmlGraphicsMouseEvent
+ \since 4.7
\brief The MouseEvent object provides information about a mouse event.
The position of the mouse can be found via the x and y properties.
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
index e92fea4..6933890 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
@@ -336,6 +336,7 @@ void QmlGraphicsFlickablePrivate::updateBeginningEnd()
/*!
\qmlclass Flickable QmlGraphicsFlickable
+ \since 4.7
\brief The Flickable item provides a surface that can be "flicked".
\inherits Item
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
index bf370ae..e54ed8e 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
@@ -675,6 +675,7 @@ void QmlGraphicsGridViewPrivate::updateCurrent(int modelIndex)
/*!
\qmlclass GridView QmlGraphicsGridView
+ \since 4.7
\inherits Flickable
\brief The GridView item provides a grid view of items provided by a model.
diff --git a/src/declarative/qml/qmlscript.cpp b/src/declarative/qml/qmlscript.cpp
index ef142a5..ef8bb93 100644
--- a/src/declarative/qml/qmlscript.cpp
+++ b/src/declarative/qml/qmlscript.cpp
@@ -43,6 +43,7 @@
/*!
\qmlclass Script QmlScript
+ \since 4.7
\brief The Script element provides a way to add JavaScript code snippets in QML.
\ingroup group_utility
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 1be95df..e8a920a 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -143,7 +143,7 @@ QML_DEFINE_NOCREATE_TYPE(QmlAbstractAnimation)
/*!
\qmlclass Animation QmlAbstractAnimation
- \since 4.7
+ \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
@@ -590,7 +590,7 @@ void QmlAbstractAnimation::timelineComplete()
/*!
\qmlclass PauseAnimation QmlPauseAnimation
- \since 4.7
+ \since 4.7
\inherits Animation
\brief The PauseAnimation element provides a pause for an animation.
@@ -664,7 +664,7 @@ QAbstractAnimation *QmlPauseAnimation::qtAnimation()
/*!
\qmlclass ColorAnimation QmlColorAnimation
- \since 4.7
+ \since 4.7
\inherits PropertyAnimation
\brief The ColorAnimation element allows you to animate color changes.
@@ -728,7 +728,7 @@ QML_DEFINE_TYPE(Qt,4,6,ColorAnimation,QmlColorAnimation)
/*!
\qmlclass ScriptAction QmlScriptAction
- \since 4.7
+ \since 4.7
\inherits Animation
\brief The ScriptAction element allows scripts to be run during an animation.
@@ -835,7 +835,7 @@ QML_DEFINE_TYPE(Qt,4,6,ScriptAction,QmlScriptAction)
/*!
\qmlclass PropertyAction QmlPropertyAction
- \since 4.7
+ \since 4.7
\inherits Animation
\brief The PropertyAction element allows immediate property changes during animation.
@@ -1084,7 +1084,7 @@ QML_DEFINE_TYPE(Qt,4,6,PropertyAction,QmlPropertyAction)
/*!
\qmlclass ParentAction QmlParentAction
- \since 4.7
+ \since 4.7
\inherits Animation
\brief The ParentAction element allows parent changes during animation.
@@ -1288,7 +1288,7 @@ QML_DEFINE_TYPE(Qt,4,6,ParentAction,QmlParentAction)
/*!
\qmlclass NumberAnimation QmlNumberAnimation
- \since 4.7
+ \since 4.7
\inherits PropertyAnimation
\brief The NumberAnimation element allows you to animate changes in properties of type qreal.
@@ -1352,7 +1352,7 @@ QML_DEFINE_TYPE(Qt,4,6,NumberAnimation,QmlNumberAnimation)
/*!
\qmlclass Vector3dAnimation QmlVector3dAnimation
- \since 4.7
+ \since 4.7
\inherits PropertyAnimation
\brief The Vector3dAnimation element allows you to animate changes in properties of type QVector3d.
*/
@@ -1411,6 +1411,7 @@ QML_DEFINE_TYPE(Qt,4,6,Vector3dAnimation,QmlVector3dAnimation)
/*!
\qmlclass RotationAnimation QmlRotationAnimation
+ \since 4.7
\inherits PropertyAnimation
\brief The RotationAnimation element allows you to animate rotations.
@@ -1619,7 +1620,7 @@ QmlListProperty<QmlAbstractAnimation> QmlAnimationGroup::animations()
/*!
\qmlclass SequentialAnimation QmlSequentialAnimation
- \since 4.7
+ \since 4.7
\inherits Animation
\brief The SequentialAnimation element allows you to run animations sequentially.
@@ -1680,7 +1681,7 @@ QML_DEFINE_TYPE(Qt,4,6,SequentialAnimation,QmlSequentialAnimation)
/*!
\qmlclass ParallelAnimation QmlParallelAnimation
- \since 4.7
+ \since 4.7
\inherits Animation
\brief The ParallelAnimation element allows you to run animations in parallel.
@@ -1789,7 +1790,7 @@ void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
/*!
\qmlclass PropertyAnimation QmlPropertyAnimation
- \since 4.7
+ \since 4.7
\inherits Animation
\brief The PropertyAnimation element allows you to animate property changes.
diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp
index d65d8cd..6d397c0 100644
--- a/src/declarative/util/qmlbehavior.cpp
+++ b/src/declarative/util/qmlbehavior.cpp
@@ -69,6 +69,7 @@ public:
/*!
\qmlclass Behavior QmlBehavior
+ \since 4.7
\brief The Behavior element allows you to specify a default animation for a property change.
Behaviors provide one way to specify \l{qmlanimation.html}{animations} in QML.
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp
index deb474a..214f6f6 100644
--- a/src/declarative/util/qmleasefollow.cpp
+++ b/src/declarative/util/qmleasefollow.cpp
@@ -251,6 +251,7 @@ void QmlEaseFollowPrivate::tick(int t)
/*!
\qmlclass EaseFollow QmlEaseFollow
+ \since 4.7
\brief The EaseFollow element allows a property to smoothly track a value.
The EaseFollow smoothly animates a property's value to a set target value
diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index 4599b99..52110d3 100644
--- a/src/declarative/util/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
@@ -74,6 +74,7 @@ QML_DEFINE_TYPE(Qt,4,6,FontLoader,QmlFontLoader)
/*!
\qmlclass FontLoader QmlFontLoader
+ \since 4.7
\ingroup group_utility
\brief This item allows using fonts by name or url.
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 8fda3ae..6958b18 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -78,6 +78,7 @@ static void dump(ModelNode *node, int ind);
/*!
\qmlclass ListModel QmlListModel
+ \since 4.7
\brief The ListModel element defines a free-form list data source.
The ListModel is a simple hierarchy of elements containing data roles. The contents can
@@ -957,6 +958,7 @@ QML_DEFINE_CUSTOM_TYPE(Qt, 4,6, ListModel, QmlListModel, QmlListModelParser)
/*!
\qmlclass ListElement
+ \since 4.7
\brief The ListElement element defines a data item in a ListModel.
\sa ListModel
diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp
index 6d4ecf2..b180d1e 100644
--- a/src/declarative/util/qmlspringfollow.cpp
+++ b/src/declarative/util/qmlspringfollow.cpp
@@ -213,6 +213,7 @@ void QmlSpringFollowPrivate::stop()
/*!
\qmlclass SpringFollow QmlSpringFollow
+ \since 4.7
\brief The SpringFollow element allows a property to track a value.
In example below, \e rect2 will follow \e rect1 moving with a velocity of up to 200:
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index 4ad77c8..7e6dc58 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -84,6 +84,7 @@ public:
/*!
\qmlclass StateGroup QmlStateGroup
+ \since 4.7
\brief The StateGroup element provides state support for non-Item elements.
Item (and all dervied elements) provides built in support for states and transitions
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index bd1f5f0..5f06045 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -147,6 +147,7 @@ void QmlParentChangePrivate::doChange(QmlGraphicsItem *targetParent, QmlGraphics
/*!
\preliminary
\qmlclass ParentChange QmlParentChange
+ \since 4.7
\brief The ParentChange element allows you to reparent an Item in a state change.
ParentChange reparents an Item while preserving its visual appearance (position, rotation,
@@ -316,6 +317,7 @@ public:
/*!
\qmlclass StateChangeScript QmlStateChangeScript
+ \since 4.7
\brief The StateChangeScript element allows you to run a script in a state.
The script specified will be run immediately when the state is made current.
@@ -394,6 +396,7 @@ QString QmlStateChangeScript::typeName() const
/*!
\qmlclass AnchorChanges QmlAnchorChanges
+ \since 4.7
\brief The AnchorChanges element allows you to change the anchors of an item in a state.
In the following example we change the top and bottom anchors of an item:
diff --git a/src/declarative/util/qmlsystempalette.cpp b/src/declarative/util/qmlsystempalette.cpp
index cc4fb3e..4e78518 100644
--- a/src/declarative/util/qmlsystempalette.cpp
+++ b/src/declarative/util/qmlsystempalette.cpp
@@ -58,6 +58,7 @@ QML_DEFINE_TYPE(Qt,4,6,SystemPalette,QmlSystemPalette)
/*!
\qmlclass SystemPalette QmlSystemPalette
+ \since 4.7
\ingroup group_utility
\brief The SystemPalette item gives access to the Qt palettes.
\sa QPalette
diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp
index d3a1a7c..1779b22 100644
--- a/src/declarative/util/qmltimer.cpp
+++ b/src/declarative/util/qmltimer.cpp
@@ -70,6 +70,7 @@ public:
/*!
\qmlclass Timer QmlTimer
+ \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
diff --git a/src/multimedia/qml/qmlaudio.cpp b/src/multimedia/qml/qmlaudio.cpp
index 89f045e..80f5678 100644
--- a/src/multimedia/qml/qmlaudio.cpp
+++ b/src/multimedia/qml/qmlaudio.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass Audio QmlAudio
+ \since 4.7
\brief The Audio element allows you to add audio playback to a scene.
\qml
diff --git a/src/multimedia/qml/qmlgraphicsvideo.cpp b/src/multimedia/qml/qmlgraphicsvideo.cpp
index 7289f4d..baf96ba 100644
--- a/src/multimedia/qml/qmlgraphicsvideo.cpp
+++ b/src/multimedia/qml/qmlgraphicsvideo.cpp
@@ -69,6 +69,7 @@ void QmlGraphicsVideo::_q_error(int errorCode, const QString &errorString)
/*!
\qmlclass Video QmlGraphicsVideo
+ \since 4.7
\brief The Video element allows you to add videos to a scene.
\inherits Item
diff --git a/src/multimedia/qml/qsoundeffect.cpp b/src/multimedia/qml/qsoundeffect.cpp
index 919aa75..541e6c9 100644
--- a/src/multimedia/qml/qsoundeffect.cpp
+++ b/src/multimedia/qml/qsoundeffect.cpp
@@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass SoundEffect QSoundEffect
+ \since 4.7
\brief The SoundEffect element provides a way to play sound effects in qml.
The following example plays a wav file on mouse click.
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 5357597..83014d3 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -1275,6 +1275,14 @@ QmlClassNode::QmlClassNode(InnerNode *parent,
}
/*!
+ I made this so I could print a debug message here.
+ */
+QmlClassNode::~QmlClassNode()
+{
+ qDebug() << "Deleting QmlClassNode:" << name();
+}
+
+/*!
The base file name for this kind of node has "qml_"
prepended to it.
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index 3798e4e..fd39698 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -379,7 +379,7 @@ class QmlClassNode : public FakeNode
QmlClassNode(InnerNode *parent,
const QString& name,
const ClassNode* cn);
- virtual ~QmlClassNode() { }
+ virtual ~QmlClassNode();
const ClassNode* classNode() const { return cnode; }
virtual QString fileBase() const;