summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/declarative/elements.qdoc3
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsgridview.cpp8
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsitem.cpp11
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp6
4 files changed, 18 insertions, 10 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 69535ce..81a6c96 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -187,11 +187,8 @@ The following table lists the QML elements provided by the Qt Declarative module
\list
\o \l Blur
\o \l Colorize
-\o \l Grayscale
-\o \l Pixelize
\o \l DropShadow
\o \l Opacity
-\o \l Bloom
\o \l Particles
\list
\o \l ParticleMotionLinear
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
index 7427266..f39f5c7 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
@@ -1154,7 +1154,7 @@ void QmlGraphicsGridView::keyPressEvent(QKeyEvent *event)
}
/*!
- \qmlmethod GridView::moveCurrentIndexUp
+ \qmlmethod GridView::moveCurrentIndexUp()
Move the currentIndex up one item in the view.
The current index will wrap if keyNavigationWraps is true and it
@@ -1177,7 +1177,7 @@ void QmlGraphicsGridView::moveCurrentIndexUp()
}
/*!
- \qmlmethod GridView::moveCurrentIndexDown
+ \qmlmethod GridView::moveCurrentIndexDown()
Move the currentIndex down one item in the view.
The current index will wrap if keyNavigationWraps is true and it
@@ -1200,7 +1200,7 @@ void QmlGraphicsGridView::moveCurrentIndexDown()
}
/*!
- \qmlmethod GridView::moveCurrentIndexLeft
+ \qmlmethod GridView::moveCurrentIndexLeft()
Move the currentIndex left one item in the view.
The current index will wrap if keyNavigationWraps is true and it
@@ -1223,7 +1223,7 @@ void QmlGraphicsGridView::moveCurrentIndexLeft()
}
/*!
- \qmlmethod GridView::moveCurrentIndexRight
+ \qmlmethod GridView::moveCurrentIndexRight()
Move the currentIndex right one item in the view.
The current index will wrap if keyNavigationWraps is true and it
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index a46c2be..572aa98 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -1908,6 +1908,17 @@ void QmlGraphicsItem::setClip(bool c)
*/
/*!
+ \qmlproperty bool Item::visible
+
+ Whether the item is visible. By default this is true.
+
+ \note visible is not linked to actual visibility; if you item
+ goes off screen, or the opacity changes to 0, etc this will
+ not affect the visible property.
+*/
+
+
+/*!
This function is called to handle this item's changes in
geometry from \a oldGeometry to \a newGeometry. If the two
geometries are the same, it doesn't do anything.
diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
index 196cdf2..22c2c0a 100644
--- a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
@@ -146,19 +146,19 @@ void QmlGraphicsDrag::setYmax(qreal m)
*/
/*!
- \qmlsignal MouseRegion::onEntered
+ \qmlsignal MouseRegion::onEntered()
This handler is called when the mouse enters the mouse region.
*/
/*!
- \qmlsignal MouseRegion::onExited
+ \qmlsignal MouseRegion::onExited()
This handler is called when the mouse exists the mouse region.
*/
/*!
- \qmlsignal MouseRegion::onPositionChanged(mouse)
+ \qmlsignal MouseRegion::onPositionChanged(MouseEvent mouse)
This handler is called when the mouse position changes.