diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-07-15 09:02:55 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-21 04:05:19 +0200 |
| commit | 6b8e98aec3f382fedea704691da40376cbe88e5e (patch) | |
| tree | c2d6bf149afbfe8961a49ada92c90677a8aa3845 /src/qtquick1/graphicsitems | |
| parent | 0592e17e18e26acc177bc7556a3c9888582f0045 (diff) | |
Bulk update of QtQuick 1 docs to \qmlmodule syntax
Change-Id: I7ed2b54ef5a706dcaf7e19d221a6dda7b2620e8c
Reviewed-on: http://codereview.qt.nokia.com/1681
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/qtquick1/graphicsitems')
25 files changed, 652 insertions, 604 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativeanimatedimage.cpp b/src/qtquick1/graphicsitems/qdeclarativeanimatedimage.cpp index 5d7ad80bbb..ac7234473f 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeanimatedimage.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeanimatedimage.cpp @@ -57,8 +57,9 @@ QT_BEGIN_NAMESPACE /*! \qmlclass AnimatedImage QDeclarative1AnimatedImage + \inqmlmodule QtQuick 1 \inherits Image - \since 4.7 + \since QtQuick 1.0 \ingroup basic-visual-elements The AnimatedImage element extends the features of the \l Image element, providing @@ -89,7 +90,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty url AnimatedImage::source + \qmlproperty url QtQuick1::AnimatedImage::source This property holds the URL that refers to the source image. @@ -100,7 +101,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool AnimatedImage::asynchronous + \qmlproperty bool QtQuick1::AnimatedImage::asynchronous Specifies that images on the local filesystem should be loaded asynchronously in a separate thread. The default value is @@ -115,7 +116,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool AnimatedImage::cache + \qmlproperty bool QtQuick1::AnimatedImage::cache \since Quick 1.1 Specifies whether the image should be cached. The default value is @@ -124,7 +125,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool AnimatedImage::mirror + \qmlproperty bool QtQuick1::AnimatedImage::mirror \since Quick 1.1 This property holds whether the image should be horizontally inverted @@ -145,7 +146,7 @@ QDeclarative1AnimatedImage::~QDeclarative1AnimatedImage() } /*! - \qmlproperty bool AnimatedImage::paused + \qmlproperty bool QtQuick1::AnimatedImage::paused This property holds whether the animated image is paused. By default, this property is false. Set it to true when you want to pause @@ -170,7 +171,7 @@ void QDeclarative1AnimatedImage::setPaused(bool pause) d->_movie->setPaused(pause); } /*! - \qmlproperty bool AnimatedImage::playing + \qmlproperty bool QtQuick1::AnimatedImage::playing This property holds whether the animated image is playing. By default, this property is true, meaning that the animation @@ -199,8 +200,8 @@ void QDeclarative1AnimatedImage::setPlaying(bool play) } /*! - \qmlproperty int AnimatedImage::currentFrame - \qmlproperty int AnimatedImage::frameCount + \qmlproperty int QtQuick1::AnimatedImage::currentFrame + \qmlproperty int QtQuick1::AnimatedImage::frameCount currentFrame is the frame that is currently visible. By monitoring this property for changes, you can animate other items at the same time as the image. diff --git a/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp b/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp index 4588d14753..e4683eecab 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp @@ -55,9 +55,10 @@ QT_BEGIN_NAMESPACE /*! \qmlclass BorderImage QDeclarative1BorderImage + \inqmlmodule QtQuick 1 \brief The BorderImage element provides an image that can be used as a border. \inherits Item - \since 4.7 + \since QtQuick 1.0 \ingroup qml-basic-visual-elements The BorderImage element is used to create borders out of images by scaling or tiling @@ -152,7 +153,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool BorderImage::asynchronous + \qmlproperty bool QtQuick1::BorderImage::asynchronous Specifies that images on the local filesystem should be loaded asynchronously in a separate thread. The default value is @@ -177,7 +178,7 @@ QDeclarative1BorderImage::~QDeclarative1BorderImage() d->sciReply->deleteLater(); } /*! - \qmlproperty enumeration BorderImage::status + \qmlproperty enumeration QtQuick1::BorderImage::status This property describes the status of image loading. It can be one of: @@ -192,7 +193,7 @@ QDeclarative1BorderImage::~QDeclarative1BorderImage() */ /*! - \qmlproperty real BorderImage::progress + \qmlproperty real QtQuick1::BorderImage::progress This property holds the progress of image loading, from 0.0 (nothing loaded) to 1.0 (finished). @@ -201,7 +202,7 @@ QDeclarative1BorderImage::~QDeclarative1BorderImage() */ /*! - \qmlproperty bool BorderImage::smooth + \qmlproperty bool QtQuick1::BorderImage::smooth Set this property if you want the image to be smoothly filtered when scaled or transformed. Smooth filtering gives better visual quality, but is slower. If @@ -216,7 +217,7 @@ QDeclarative1BorderImage::~QDeclarative1BorderImage() */ /*! - \qmlproperty bool BorderImage::cache + \qmlproperty bool QtQuick1::BorderImage::cache \since Quick 1.1 Specifies whether the image should be cached. The default value is @@ -225,7 +226,7 @@ QDeclarative1BorderImage::~QDeclarative1BorderImage() */ /*! - \qmlproperty bool BorderImage::mirror + \qmlproperty bool QtQuick1::BorderImage::mirror \since Quick 1.1 This property holds whether the image should be horizontally inverted @@ -235,7 +236,7 @@ QDeclarative1BorderImage::~QDeclarative1BorderImage() */ /*! - \qmlproperty url BorderImage::source + \qmlproperty url QtQuick1::BorderImage::source This property holds the URL that refers to the source image. @@ -263,7 +264,7 @@ QDeclarative1BorderImage::~QDeclarative1BorderImage() */ /*! - \qmlproperty QSize BorderImage::sourceSize + \qmlproperty QSize QtQuick1::BorderImage::sourceSize This property holds the actual width and height of the loaded image. @@ -371,10 +372,10 @@ void QDeclarative1BorderImage::load() } /*! - \qmlproperty int BorderImage::border.left - \qmlproperty int BorderImage::border.right - \qmlproperty int BorderImage::border.top - \qmlproperty int BorderImage::border.bottom + \qmlproperty int QtQuick1::BorderImage::border.left + \qmlproperty int QtQuick1::BorderImage::border.right + \qmlproperty int QtQuick1::BorderImage::border.top + \qmlproperty int QtQuick1::BorderImage::border.bottom The 4 border lines (2 horizontal and 2 vertical) break the image into 9 sections, as shown below: @@ -406,8 +407,8 @@ QDeclarative1ScaleGrid *QDeclarative1BorderImage::border() } /*! - \qmlproperty enumeration BorderImage::horizontalTileMode - \qmlproperty enumeration BorderImage::verticalTileMode + \qmlproperty enumeration QtQuick1::BorderImage::horizontalTileMode + \qmlproperty enumeration QtQuick1::BorderImage::verticalTileMode This property describes how to repeat or stretch the middle parts of the border image. diff --git a/src/qtquick1/graphicsitems/qdeclarativeevents.cpp b/src/qtquick1/graphicsitems/qdeclarativeevents.cpp index 227ad6d662..043f6820c2 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeevents.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeevents.cpp @@ -46,7 +46,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass KeyEvent QDeclarative1KeyEvent - \since 4.7 + \inqmlmodule QtQuick 1 + \since QtQuick 1.0 \ingroup qml-event-elements \brief The KeyEvent object provides information about a key event. @@ -62,7 +63,7 @@ Item { */ /*! - \qmlproperty int KeyEvent::key + \qmlproperty int QtQuick1::KeyEvent::key This property holds the code of the key that was pressed or released. @@ -79,7 +80,7 @@ Item { */ /*! - \qmlproperty string KeyEvent::text + \qmlproperty string QtQuick1::KeyEvent::text This property holds the Unicode text that the key generated. The text returned can be an empty string in cases where modifier keys, @@ -88,20 +89,20 @@ Item { */ /*! - \qmlproperty bool KeyEvent::isAutoRepeat + \qmlproperty bool QtQuick1::KeyEvent::isAutoRepeat This property holds whether this event comes from an auto-repeating key. */ /*! - \qmlproperty int KeyEvent::count + \qmlproperty int QtQuick1::KeyEvent::count This property holds the number of keys involved in this event. If \l KeyEvent::text is not empty, this is simply the length of the string. */ /*! - \qmlproperty bool KeyEvent::accepted + \qmlproperty bool QtQuick1::KeyEvent::accepted Setting \a accepted to true prevents the key event from being propagated to the item's parent. @@ -111,7 +112,7 @@ Item { */ /*! - \qmlproperty int KeyEvent::modifiers + \qmlproperty int QtQuick1::KeyEvent::modifiers This property holds the keyboard modifier flags that existed immediately before the event occurred. @@ -141,7 +142,8 @@ Item { /*! \qmlclass MouseEvent QDeclarative1MouseEvent - \since 4.7 + \inqmlmodule QtQuick 1 + \since QtQuick 1.0 \ingroup qml-event-elements \brief The MouseEvent object provides information about a mouse event. @@ -158,15 +160,15 @@ Item { */ /*! - \qmlproperty int MouseEvent::x - \qmlproperty int MouseEvent::y + \qmlproperty int QtQuick1::MouseEvent::x + \qmlproperty int QtQuick1::MouseEvent::y These properties hold the coordinates of the position supplied by the mouse event. */ /*! - \qmlproperty bool MouseEvent::accepted + \qmlproperty bool QtQuick1::MouseEvent::accepted Setting \a accepted to true prevents the mouse event from being propagated to items below this item. @@ -176,7 +178,7 @@ Item { */ /*! - \qmlproperty enumeration MouseEvent::button + \qmlproperty enumeration QtQuick1::MouseEvent::button This property holds the button that caused the event. It can be one of: \list @@ -187,14 +189,14 @@ Item { */ /*! - \qmlproperty bool MouseEvent::wasHeld + \qmlproperty bool QtQuick1::MouseEvent::wasHeld This property is true if the mouse button has been held pressed longer the threshold (800ms). */ /*! - \qmlproperty int MouseEvent::buttons + \qmlproperty int QtQuick1::MouseEvent::buttons This property holds the mouse buttons pressed when the event was generated. For mouse move events, this is all buttons that are pressed down. For mouse @@ -210,7 +212,7 @@ Item { */ /*! - \qmlproperty int MouseEvent::modifiers + \qmlproperty int QtQuick1::MouseEvent::modifiers This property holds the keyboard modifier flags that existed immediately before the event occurred. diff --git a/src/qtquick1/graphicsitems/qdeclarativeflickable.cpp b/src/qtquick1/graphicsitems/qdeclarativeflickable.cpp index 37a784f480..34bbb89ab1 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeflickable.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeflickable.cpp @@ -430,7 +430,8 @@ void QDeclarative1FlickablePrivate::updateBeginningEnd() /*! \qmlclass Flickable QDeclarative1Flickable - \since 4.7 + \inqmlmodule QtQuick 1 + \since QtQuick 1.0 \ingroup qml-basic-interaction-elements \brief The Flickable item provides a surface that can be "flicked". @@ -478,14 +479,14 @@ void QDeclarative1FlickablePrivate::updateBeginningEnd() */ /*! - \qmlsignal Flickable::onMovementStarted() + \qmlsignal QtQuick1::Flickable::onMovementStarted() This handler is called when the view begins moving due to user interaction. */ /*! - \qmlsignal Flickable::onMovementEnded() + \qmlsignal QtQuick1::Flickable::onMovementEnded() This handler is called when the view stops moving due to user interaction. If a flick was generated, this handler will @@ -495,7 +496,7 @@ void QDeclarative1FlickablePrivate::updateBeginningEnd() */ /*! - \qmlsignal Flickable::onFlickStarted() + \qmlsignal QtQuick1::Flickable::onFlickStarted() This handler is called when the view is flicked. A flick starts from the point that the mouse or touch is released, @@ -503,16 +504,16 @@ void QDeclarative1FlickablePrivate::updateBeginningEnd() */ /*! - \qmlsignal Flickable::onFlickEnded() + \qmlsignal QtQuick1::Flickable::onFlickEnded() This handler is called when the view stops moving due to a flick. */ /*! - \qmlproperty real Flickable::visibleArea.xPosition - \qmlproperty real Flickable::visibleArea.widthRatio - \qmlproperty real Flickable::visibleArea.yPosition - \qmlproperty real Flickable::visibleArea.heightRatio + \qmlproperty real QtQuick1::Flickable::visibleArea.xPosition + \qmlproperty real QtQuick1::Flickable::visibleArea.widthRatio + \qmlproperty real QtQuick1::Flickable::visibleArea.yPosition + \qmlproperty real QtQuick1::Flickable::visibleArea.heightRatio These properties describe the position and size of the currently viewed area. The size is defined as the percentage of the full view currently visible, @@ -549,8 +550,8 @@ QDeclarative1Flickable::~QDeclarative1Flickable() } /*! - \qmlproperty real Flickable::contentX - \qmlproperty real Flickable::contentY + \qmlproperty real QtQuick1::Flickable::contentX + \qmlproperty real QtQuick1::Flickable::contentY These properties hold the surface coordinate currently at the top-left corner of the Flickable. For example, if you flick an image up 100 pixels, @@ -593,7 +594,7 @@ void QDeclarative1Flickable::setContentY(qreal pos) } /*! - \qmlproperty bool Flickable::interactive + \qmlproperty bool QtQuick1::Flickable::interactive This property describes whether the user can interact with the Flickable. A user cannot drag or flick a Flickable that is not interactive. @@ -631,8 +632,8 @@ void QDeclarative1Flickable::setInteractive(bool interactive) } /*! - \qmlproperty real Flickable::horizontalVelocity - \qmlproperty real Flickable::verticalVelocity + \qmlproperty real QtQuick1::Flickable::horizontalVelocity + \qmlproperty real QtQuick1::Flickable::verticalVelocity The instantaneous velocity of movement along the x and y axes, in pixels/sec. @@ -651,10 +652,10 @@ qreal QDeclarative1Flickable::verticalVelocity() const } /*! - \qmlproperty bool Flickable::atXBeginning - \qmlproperty bool Flickable::atXEnd - \qmlproperty bool Flickable::atYBeginning - \qmlproperty bool Flickable::atYEnd + \qmlproperty bool QtQuick1::Flickable::atXBeginning + \qmlproperty bool QtQuick1::Flickable::atXEnd + \qmlproperty bool QtQuick1::Flickable::atYBeginning + \qmlproperty bool QtQuick1::Flickable::atYEnd These properties are true if the flickable view is positioned at the beginning, or end respecively. @@ -689,7 +690,7 @@ void QDeclarative1Flickable::ticked() } /*! - \qmlproperty Item Flickable::contentItem + \qmlproperty Item QtQuick1::Flickable::contentItem The internal item that contains the Items to be moved in the Flickable. @@ -721,7 +722,7 @@ QDeclarative1FlickableVisibleArea *QDeclarative1Flickable::visibleArea() } /*! - \qmlproperty enumeration Flickable::flickableDirection + \qmlproperty enumeration QtQuick1::Flickable::flickableDirection This property determines which directions the view can be flicked. @@ -1284,7 +1285,7 @@ QDeclarativeListProperty<QGraphicsObject> QDeclarative1Flickable::flickableChild } /*! - \qmlproperty enumeration Flickable::boundsBehavior + \qmlproperty enumeration QtQuick1::Flickable::boundsBehavior This property holds whether the surface may be dragged beyond the Fickable's boundaries, or overshoot the Flickable's boundaries when flicked. @@ -1320,8 +1321,8 @@ void QDeclarative1Flickable::setBoundsBehavior(BoundsBehavior b) } /*! - \qmlproperty real Flickable::contentWidth - \qmlproperty real Flickable::contentHeight + \qmlproperty real QtQuick1::Flickable::contentWidth + \qmlproperty real QtQuick1::Flickable::contentHeight The dimensions of the content (the surface controlled by Flickable). This should typically be set to the combined size of the items placed in the @@ -1393,7 +1394,7 @@ void QDeclarative1Flickable::setContentHeight(qreal h) } /*! - \qmlmethod Flickable::resizeContent(real width, real height, QPointF center) + \qmlmethod QtQuick1::Flickable::resizeContent(real width, real height, QPointF center) \preliminary \since Quick 1.1 @@ -1433,7 +1434,7 @@ void QDeclarative1Flickable::resizeContent(qreal w, qreal h, QPointF center) } /*! - \qmlmethod Flickable::returnToBounds() + \qmlmethod QtQuick1::Flickable::returnToBounds() \preliminary \since Quick 1.1 @@ -1593,7 +1594,7 @@ bool QDeclarative1Flickable::sceneEventFilter(QGraphicsItem *i, QEvent *e) } /*! - \qmlproperty real Flickable::maximumFlickVelocity + \qmlproperty real QtQuick1::Flickable::maximumFlickVelocity This property holds the maximum velocity that the user can flick the view in pixels/second. The default value is platform dependent. @@ -1614,7 +1615,7 @@ void QDeclarative1Flickable::setMaximumFlickVelocity(qreal v) } /*! - \qmlproperty real Flickable::flickDeceleration + \qmlproperty real QtQuick1::Flickable::flickDeceleration This property holds the rate at which a flick will decelerate. The default value is platform dependent. @@ -1641,9 +1642,9 @@ bool QDeclarative1Flickable::isFlicking() const } /*! - \qmlproperty bool Flickable::flicking - \qmlproperty bool Flickable::flickingHorizontally - \qmlproperty bool Flickable::flickingVertically + \qmlproperty bool QtQuick1::Flickable::flicking + \qmlproperty bool QtQuick1::Flickable::flickingHorizontally + \qmlproperty bool QtQuick1::Flickable::flickingVertically These properties describe whether the view is currently moving horizontally, vertically or in either direction, due to the user flicking the view. @@ -1661,7 +1662,7 @@ bool QDeclarative1Flickable::isFlickingVertically() const } /*! - \qmlproperty int Flickable::pressDelay + \qmlproperty int QtQuick1::Flickable::pressDelay This property holds the time to delay (ms) delivering a press to children of the Flickable. This can be useful where reacting @@ -1697,9 +1698,9 @@ bool QDeclarative1Flickable::isMoving() const } /*! - \qmlproperty bool Flickable::moving - \qmlproperty bool Flickable::movingHorizontally - \qmlproperty bool Flickable::movingVertically + \qmlproperty bool QtQuick1::Flickable::moving + \qmlproperty bool QtQuick1::Flickable::movingHorizontally + \qmlproperty bool QtQuick1::Flickable::movingVertically These properties describe whether the view is currently moving horizontally, vertically or in either direction, due to the user either dragging or diff --git a/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp b/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp index d25f33a129..a4f83c1fb5 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp @@ -71,7 +71,8 @@ public: /*! \qmlclass Flipable QDeclarative1Flipable - \since 4.7 + \inqmlmodule QtQuick 1 + \since QtQuick 1.0 \ingroup qml-basic-interaction-elements \brief The Flipable item provides a surface that can be flipped. \inherits Item @@ -121,8 +122,8 @@ QDeclarative1Flipable::~QDeclarative1Flipable() } /*! - \qmlproperty Item Flipable::front - \qmlproperty Item Flipable::back + \qmlproperty Item QtQuick1::Flipable::front + \qmlproperty Item QtQuick1::Flipable::back The front and back sides of the flipable. */ @@ -179,7 +180,7 @@ void QDeclarative1Flipable::retransformBack() } /*! - \qmlproperty enumeration Flipable::side + \qmlproperty enumeration QtQuick1::Flipable::side The side of the Flipable currently visible. Possible values are \c Flipable.Front and \c Flipable.Back. diff --git a/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp b/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp index e50df2ace5..4797033bff 100644 --- a/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp @@ -52,7 +52,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass FocusPanel QDeclarative1FocusPanel - \since 4.7 + \inqmlmodule QtQuick 1 + \since QtQuick 1.0 \ingroup qml-basic-interaction-elements \brief The FocusPanel item explicitly creates a focus panel. @@ -75,7 +76,7 @@ QDeclarative1FocusPanel::~QDeclarative1FocusPanel() } /*! - \qmlproperty bool FocusPanel::active + \qmlproperty bool QtQuick1::FocusPanel::active Sets whether the item is the active focus panel. */ diff --git a/src/qtquick1/graphicsitems/qdeclarativefocusscope.cpp b/src/qtquick1/graphicsitems/qdeclarativefocusscope.cpp index 5d942de9bc..d2c21868b3 100644 --- a/src/qtquick1/graphicsitems/qdeclarativefocusscope.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativefocusscope.cpp @@ -49,7 +49,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass FocusScope QDeclarative1FocusScope - \since 4.7 + \inqmlmodule QtQuick 1 + \since QtQuick 1.0 \ingroup qml-basic-interaction-elements \brief The FocusScope object explicitly creates a focus scope. diff --git a/src/qtquick1/graphicsitems/qdeclarativegridview.cpp b/src/qtquick1/graphicsitems/qdeclarativegridview.cpp index 228cd2aba1..ff54b13b21 100644 --- a/src/qtquick1/graphicsitems/qdeclarativegridview.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativegridview.cpp @@ -1248,7 +1248,8 @@ void QDeclarative1GridViewPrivate::flick(AxisData &data, qreal minExtent, qreal /*! \qmlclass GridView QDeclarative1GridView - \since 4.7 + \inqmlmodule QtQuick 1 + \since QtQuick 1.0 \ingroup qml-view-elements \inherits Flickable @@ -1369,18 +1370,18 @@ QDeclarative1GridView::~QDeclarative1GridView() */ /*! - \qmlattachedsignal GridView::onAdd() + \qmlattachedsignal QtQuick1::GridView::onAdd() This attached handler is called immediately after an item is added to the view. */ /*! - \qmlattachedsignal GridView::onRemove() + \qmlattachedsignal QtQuick1::GridView::onRemove() This attached handler is called immediately before an item is removed from the view. */ /*! - \qmlproperty model GridView::model + \qmlproperty model QtQuick1::GridView::model This property holds the model providing data for the grid. The model provides the set of data that is used to create the items @@ -1463,7 +1464,7 @@ void QDeclarative1GridView::setModel(const QVariant &model) } /*! - \qmlproperty Component GridView::delegate + \qmlproperty Component QtQuick1::GridView::delegate The delegate provides a template defining each item instantiated by the view. The index is exposed as an accessible \c index property. Properties of the @@ -1527,8 +1528,8 @@ void QDeclarative1GridView::setDelegate(QDeclarativeComponent *delegate) } /*! - \qmlproperty int GridView::currentIndex - \qmlproperty Item GridView::currentItem + \qmlproperty int QtQuick1::GridView::currentIndex + \qmlproperty Item QtQuick1::GridView::currentItem The \c currentIndex property holds the index of the current item, and \c currentItem holds the current item. Setting the currentIndex to -1 @@ -1573,7 +1574,7 @@ QDeclarativeItem *QDeclarative1GridView::currentItem() } /*! - \qmlproperty Item GridView::highlightItem + \qmlproperty Item QtQuick1::GridView::highlightItem This holds the highlight item created from the \l highlight component. @@ -1591,7 +1592,7 @@ QDeclarativeItem *QDeclarative1GridView::highlightItem() } /*! - \qmlproperty int GridView::count + \qmlproperty int QtQuick1::GridView::count This property holds the number of items in the view. */ int QDeclarative1GridView::count() const @@ -1603,7 +1604,7 @@ int QDeclarative1GridView::count() const } /*! - \qmlproperty Component GridView::highlight + \qmlproperty Component QtQuick1::GridView::highlight This property holds the component to use as the highlight. An instance of the highlight component is created for each view. @@ -1629,7 +1630,7 @@ void QDeclarative1GridView::setHighlight(QDeclarativeComponent *highlight) } /*! - \qmlproperty bool GridView::highlightFollowsCurrentItem + \qmlproperty bool QtQuick1::GridView::highlightFollowsCurrentItem This property sets whether the highlight is managed by the view. If this property is true (the default value), the highlight is moved smoothly @@ -1662,7 +1663,7 @@ void QDeclarative1GridView::setHighlightFollowsCurrentItem(bool autoHighlight) } /*! - \qmlproperty int GridView::highlightMoveDuration + \qmlproperty int QtQuick1::GridView::highlightMoveDuration This property holds the move animation duration of the highlight delegate. highlightFollowsCurrentItem must be true for this property @@ -1693,9 +1694,9 @@ void QDeclarative1GridView::setHighlightMoveDuration(int duration) /*! - \qmlproperty real GridView::preferredHighlightBegin - \qmlproperty real GridView::preferredHighlightEnd - \qmlproperty enumeration GridView::highlightRangeMode + \qmlproperty real QtQuick1::GridView::preferredHighlightBegin + \qmlproperty real QtQuick1::GridView::preferredHighlightEnd + \qmlproperty enumeration QtQuick1::GridView::highlightRangeMode These properties define the preferred range of the highlight (for the current item) within the view. The \c preferredHighlightBegin value must be less than the @@ -1793,7 +1794,7 @@ void QDeclarative1GridView::setHighlightRangeMode(HighlightRangeMode mode) } /*! - \qmlproperty enumeration GridView::layoutDirection + \qmlproperty enumeration QtQuick1::GridView::layoutDirection This property holds the layout direction of the grid. Possible values: @@ -1828,7 +1829,7 @@ void QDeclarative1GridView::setLayoutDirection(Qt::LayoutDirection layoutDirecti } /*! - \qmlproperty enumeration GridView::effectiveLayoutDirection + \qmlproperty enumeration QtQuick1::GridView::effectiveLayoutDirection This property holds the effective layout direction of the grid. When using the attached property \l {LayoutMirroring::enabled}{LayoutMirroring::enabled} for locale layouts, @@ -1848,7 +1849,7 @@ Qt::LayoutDirection QDeclarative1GridView::effectiveLayoutDirection() const } /*! - \qmlproperty enumeration GridView::flow + \qmlproperty enumeration QtQuick1::GridView::flow This property holds the flow of the grid. Possible values: @@ -1884,7 +1885,7 @@ void QDeclarative1GridView::setFlow(Flow flow) } /*! - \qmlproperty bool GridView::keyNavigationWraps + \qmlproperty bool QtQuick1::GridView::keyNavigationWraps This property holds whether the grid wraps key navigation If this is true, key navigation that would move the current item selection @@ -1909,7 +1910,7 @@ void QDeclarative1GridView::setWrapEnabled(bool wrap) } /*! - \qmlproperty int GridView::cacheBuffer + \qmlproperty int QtQuick1::GridView::cacheBuffer This property determines whether delegates are retained outside the visible area of the view. @@ -1945,8 +1946,8 @@ void QDeclarative1GridView::setCacheBuffer(int buffer) } /*! - \qmlproperty int GridView::cellWidth - \qmlproperty int GridView::cellHeight + \qmlproperty int QtQuick1::GridView::cellWidth + \qmlproperty int QtQuick1::GridView::cellHeight These properties holds the width and height of each cell in the grid. @@ -1986,7 +1987,7 @@ void QDeclarative1GridView::setCellHeight(int cellHeight) } } /*! - \qmlproperty enumeration GridView::snapMode + \qmlproperty enumeration QtQuick1::GridView::snapMode This property determines how the view scrolling will settle following a drag or flick. The possible values are: @@ -2017,7 +2018,7 @@ void QDeclarative1GridView::setSnapMode(SnapMode mode) } /*! - \qmlproperty Component GridView::footer + \qmlproperty Component QtQuick1::GridView::footer This property holds the component to use as the footer. An instance of the footer component is created for each view. The @@ -2053,7 +2054,7 @@ void QDeclarative1GridView::setFooter(QDeclarativeComponent *footer) } /*! - \qmlproperty Component GridView::header + \qmlproperty Component QtQuick1::GridView::header This property holds the component to use as the header. An instance of the header component is created for each view. The @@ -2329,7 +2330,7 @@ void QDeclarative1GridView::keyPressEvent(QKeyEvent *event) } /*! - \qmlmethod GridView::moveCurrentIndexUp() + \qmlmethod QtQuick1::GridView::moveCurrentIndexUp() Move the currentIndex up one item in the view. The current index will wrap if keyNavigationWraps is true and it @@ -2357,7 +2358,7 @@ void QDeclarative1GridView::moveCurrentIndexUp() } /*! - \qmlmethod GridView::moveCurrentIndexDown() + \qmlmethod QtQuick1::GridView::moveCurrentIndexDown() Move the currentIndex down one item in the view. The current index will wrap if keyNavigationWraps is true and it @@ -2385,7 +2386,7 @@ void QDeclarative1GridView::moveCurrentIndexDown() } /*! - \qmlmethod GridView::moveCurrentIndexLeft() + \qmlmethod QtQuick1::GridView::moveCurrentIndexLeft() Move the currentIndex left one item in the view. The current index will wrap if keyNavigationWraps is true and it @@ -2428,7 +2429,7 @@ void QDeclarative1GridView::moveCurrentIndexLeft() } /*! - \qmlmethod GridView::moveCurrentIndexRight() + \qmlmethod QtQuick1::GridView::moveCurrentIndexRight() Move the currentIndex right one item in the view. The current index will wrap if keyNavigationWraps is true and it @@ -2556,7 +2557,7 @@ void QDeclarative1GridViewPrivate::positionViewAtIndex(int index, int mode) } /*! - \qmlmethod GridView::positionViewAtIndex(int index, PositionMode mode) + \qmlmethod QtQuick1::GridView::positionViewAtIndex(int index, PositionMode mode) Positions the view such that the \a index is at the position specified by \a mode: @@ -2596,8 +2597,8 @@ void QDeclarative1GridView::positionViewAtIndex(int index, int mode) } /*! - \qmlmethod GridView::positionViewAtBeginning() - \qmlmethod GridView::positionViewAtEnd() + \qmlmethod QtQuick1::GridView::positionViewAtBeginning() + \qmlmethod QtQuick1::GridView::positionViewAtEnd() \since Quick 1.1 Positions the view at the beginning or end, taking into account any header or footer. @@ -2632,7 +2633,7 @@ void QDeclarative1GridView::positionViewAtEnd() } /*! - \qmlmethod int GridView::indexAt(int x, int y) + \qmlmethod int QtQuick1::GridView::indexAt(int x, int y) Returns the index of the visible item containing the point \a x, \a y in content coordinates. If there is no item at the point specified, or the item is diff --git a/src/qtquick1/graphicsitems/qdeclarativeimage.cpp b/src/qtquick1/graphicsitems/qdeclarativeimage.cpp index c3d0802e8c..89df7abf08 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeimage.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeimage.cpp @@ -52,7 +52,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Image QDeclarative1Image - \since 4.7 + \inqmlmodule QtQuick 1 + \since QtQuick 1.0 \ingroup qml-basic-visual-elements \brief The Image element displays an image in a declarative user interface \inherits Item @@ -145,7 +146,7 @@ void QDeclarative1ImagePrivate::setPixmap(const QPixmap &pixmap) } /*! - \qmlproperty enumeration Image::fillMode + \qmlproperty enumeration QtQuick1::Image::fillMode Set this property to define what happens when the source image has a different size than the item. @@ -258,8 +259,8 @@ void QDeclarative1Image::setFillMode(FillMode mode) /*! - \qmlproperty real Image::paintedWidth - \qmlproperty real Image::paintedHeight + \qmlproperty real QtQuick1::Image::paintedWidth + \qmlproperty real QtQuick1::Image::paintedHeight These properties hold the size of the image that is actually painted. In most cases it is the same as \c width and \c height, but when using a @@ -280,7 +281,7 @@ qreal QDeclarative1Image::paintedHeight() const } /*! - \qmlproperty enumeration Image::status + \qmlproperty enumeration QtQuick1::Image::status This property holds the status of image loading. It can be one of: \list @@ -317,7 +318,7 @@ qreal QDeclarative1Image::paintedHeight() const */ /*! - \qmlproperty real Image::progress + \qmlproperty real QtQuick1::Image::progress This property holds the progress of image loading, from 0.0 (nothing loaded) to 1.0 (finished). @@ -326,7 +327,7 @@ qreal QDeclarative1Image::paintedHeight() const */ /*! - \qmlproperty bool Image::smooth + \qmlproperty bool QtQuick1::Image::smooth Set this property if you want the image to be smoothly filtered when scaled or transformed. Smooth filtering gives better visual quality, but is slower. If @@ -339,7 +340,7 @@ qreal QDeclarative1Image::paintedHeight() const */ /*! - \qmlproperty QSize Image::sourceSize + \qmlproperty QSize QtQuick1::Image::sourceSize This property holds the actual width and height of the loaded image. @@ -449,7 +450,7 @@ QRectF QDeclarative1Image::boundingRect() const } /*! - \qmlproperty url Image::source + \qmlproperty url QtQuick1::Image::source Image can handle any image format supported by Qt, loaded from any URL scheme supported by Qt. @@ -459,7 +460,7 @@ QRectF QDeclarative1Image::boundingRect() const */ /*! - \qmlproperty bool Image::asynchronous + \qmlproperty bool QtQuick1::Image::asynchronous Specifies that images on the local filesystem should be loaded asynchronously in a separate thread. The default value is @@ -474,7 +475,7 @@ QRectF QDeclarative1Image::boundingRect() const */ /*! - \qmlproperty bool Image::cache + \qmlproperty bool QtQuick1::Image::cache \since Quick 1.1 Specifies whether the image should be cached. The default value is @@ -483,7 +484,7 @@ QRectF QDeclarative1Image::boundingRect() const */ /*! - \qmlproperty bool Image::mirror + \qmlproperty bool QtQuick1::Image::mirror \since Quick 1.1 This property holds whether the image should be horizontally inverted diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp index 46cfe526e4..d2bfc578dd 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp @@ -70,8 +70,9 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Transform QGraphicsTransform + \inqmlmodule QtQuick 1 \ingroup qml-transform-elements - \since 4.7 + \since QtQuick 1.0 \brief The Transform elements provide a way of building advanced transformations on Items. The Transform element is a base type which cannot be instantiated directly. @@ -92,8 +93,9 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Translate QDeclarative1Translate + \inqmlmodule QtQuick 1 \ingroup qml-transform-elements - \since 4.7 + \since QtQuick 1.0 \brief The Translate object provides a way to move an Item without changing its x or y properties. The Translate object provides independent control over position in addition to the Item's x and y properties. @@ -121,21 +123,22 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty real Translate::x + \qmlproperty real QtQuick1::Translate::x The translation along the X axis. */ /*! - \qmlproperty real Translate::y + \qmlproperty real QtQuick1::Translate::y The translation along the Y axis. */ /*! \qmlclass Scale QGraphicsScale + \inqmlmodule QtQuick 1 \ingroup qml-transform-elements - \since 4.7 + \since QtQuick 1.0 \brief The Scale element provides a way to scale an Item. The Scale element gives more control over scaling than using \l Item's \l{Item::scale}{scale} property. Specifically, @@ -155,29 +158,30 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty real Scale::origin.x - \qmlproperty real Scale::origin.y + \qmlproperty real QtQuick1::Scale::origin.x + \qmlproperty real QtQuick1::Scale::origin.y The point that the item is scaled from (i.e., the point that stays fixed relative to the parent as the rest of the item grows). By default the origin is 0, 0. */ /*! - \qmlproperty real Scale::xScale + \qmlproperty real QtQuick1::Scale::xScale The scaling factor for the X axis. */ /*! - \qmlproperty real Scale::yScale + \qmlproperty real QtQuick1::Scale::yScale The scaling factor for the Y axis. */ /*! \qmlclass Rotation QGraphicsRotation + \inqmlmodule QtQuick 1 \ingroup qml-transform-elements - \since 4.7 + \since QtQuick 1.0 \brief The Rotation object provides a way to rotate an Item. The Rotation object gives more control over rotation than using \l Item's \l{Item::rotation}{rotation} property. @@ -204,17 +208,17 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty real Rotation::origin.x - \qmlproperty real Rotation::origin.y + \qmlproperty real QtQuick1::Rotation::origin.x + \qmlproperty real QtQuick1::Rotation::origin.y The origin point of the rotation (i.e., the point that stays fixed relative to the parent as the rest of the item rotates). By default the origin is 0, 0. */ /*! - \qmlproperty real Rotation::axis.x - \qmlproperty real Rotation::axis.y - \qmlproperty real Rotation::axis.z + \qmlproperty real QtQuick1::Rotation::axis.x + \qmlproperty real QtQuick1::Rotation::axis.y + \qmlproperty real QtQuick1::Rotation::axis.z The axis to rotate around. For simple (2D) rotation around a point, you do not need to specify an axis, as the default axis is the z axis (\c{ axis { x: 0; y: 0; z: 1 } }). @@ -225,7 +229,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty real Rotation::angle + \qmlproperty real QtQuick1::Rotation::angle The angle to rotate, in degrees clockwise. */ @@ -418,8 +422,9 @@ void QDeclarativeItemKeyFilter::componentComplete() /*! \qmlclass KeyNavigation QDeclarative1KeyNavigationAttached + \inqmlmodule QtQuick 1 \ingroup qml-basic-interaction-elements - \since 4.7 + \since QtQuick 1.0 \brief The KeyNavigation attached property supports key navigation by arrow keys. Key-based user interfaces commonly allow the use of arrow keys to navigate between @@ -460,12 +465,12 @@ void QDeclarativeItemKeyFilter::componentComplete() */ /*! - \qmlproperty Item KeyNavigation::left - \qmlproperty Item KeyNavigation::right - \qmlproperty Item KeyNavigation::up - \qmlproperty Item KeyNavigation::down - \qmlproperty Item KeyNavigation::tab - \qmlproperty Item KeyNavigation::backtab + \qmlproperty Item QtQuick1::KeyNavigation::left + \qmlproperty Item QtQuick1::KeyNavigation::right + \qmlproperty Item QtQuick1::KeyNavigation::up + \qmlproperty Item QtQuick1::KeyNavigation::down + \qmlproperty Item QtQuick1::KeyNavigation::tab + \qmlproperty Item QtQuick1::KeyNavigation::backtab These properties hold the item to assign focus to when the left, right, up or down cursor keys, or the @@ -473,8 +478,8 @@ void QDeclarativeItemKeyFilter::componentComplete() */ /*! - \qmlproperty Item KeyNavigation::tab - \qmlproperty Item KeyNavigation::backtab + \qmlproperty Item QtQuick1::KeyNavigation::tab + \qmlproperty Item QtQuick1::KeyNavigation::backtab These properties hold the item to assign focus to when the Tab key or Shift+Tab key combination (Backtab) are pressed. @@ -626,7 +631,7 @@ void QDeclarative1KeyNavigationAttached::setBacktab(QDeclarativeItem *i) } /*! - \qmlproperty enumeration KeyNavigation::priority + \qmlproperty enumeration QtQuick1::KeyNavigation::priority This property determines whether the keys are processed before or after the attached item's own key handling. @@ -793,6 +798,7 @@ void QDeclarative1KeyNavigationAttached::setFocusNavigation(QDeclarativeItem *cu /*! \qmlclass LayoutMirroring QDeclarative1LayoutMirroringAttached + \inqmlmodule QtQuick 1 \since QtQuick 1.1 \ingroup qml-utility-elements \brief The LayoutMirroring attached property is used to mirror layout behavior. @@ -834,7 +840,7 @@ void QDeclarative1KeyNavigationAttached::setFocusNavigation(QDeclarativeItem *cu */ /*! - \qmlproperty bool LayoutMirroring::enabled + \qmlproperty bool QtQuick1::LayoutMirroring::enabled This property holds whether the item's layout is mirrored horizontally. Setting this to true horizontally reverses \l {anchor-layout}{anchor} settings such that left anchors become right, @@ -846,7 +852,7 @@ void QDeclarative1KeyNavigationAttached::setFocusNavigation(QDeclarativeItem *cu */ /*! - \qmlproperty bool LayoutMirroring::childrenInherit + \qmlproperty bool QtQuick1::LayoutMirroring::childrenInherit This property holds whether the \l {enabled}{LayoutMirroring.enabled} value for this item is inherited by its children. @@ -958,8 +964,9 @@ void QDeclarativeItemPrivate::setLayoutMirror(bool mirror) /*! \qmlclass Keys QDeclarative1KeysAttached + \inqmlmodule QtQuick 1 \ingroup qml-basic-interaction-elements - \since 4.7 + \since QtQuick 1.0 \brief The Keys attached property provides key handling to Items. All visual primitives support key handling via the Keys @@ -1021,14 +1028,14 @@ void QDeclarativeItemPrivate::setLayoutMirror(bool mirror) */ /*! - \qmlproperty bool Keys::enabled + \qmlproperty bool QtQuick1::Keys::enabled This flags enables key handling if true (default); otherwise no key handlers will be called. */ /*! - \qmlproperty enumeration Keys::priority + \qmlproperty enumeration QtQuick1::Keys::priority This property determines whether the keys are processed before or after the attached item's own key handling. @@ -1044,7 +1051,7 @@ void QDeclarativeItemPrivate::setLayoutMirror(bool mirror) */ /*! - \qmlproperty list<Object> Keys::forwardTo + \qmlproperty list<Object> QtQuick1::Keys::forwardTo This property provides a way to forward key presses, key releases, and keyboard input coming from input methods to other items. This can be useful when you want @@ -1071,273 +1078,273 @@ void QDeclarativeItemPrivate::setLayoutMirror(bool mirror) */ /*! - \qmlsignal Keys::onPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onPressed(KeyEvent event) This handler is called when a key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onReleased(KeyEvent event) + \qmlsignal QtQuick1::Keys::onReleased(KeyEvent event) This handler is called when a key has been released. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit0Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit0Pressed(KeyEvent event) This handler is called when the digit '0' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit1Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit1Pressed(KeyEvent event) This handler is called when the digit '1' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit2Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit2Pressed(KeyEvent event) This handler is called when the digit '2' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit3Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit3Pressed(KeyEvent event) This handler is called when the digit '3' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit4Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit4Pressed(KeyEvent event) This handler is called when the digit '4' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit5Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit5Pressed(KeyEvent event) This handler is called when the digit '5' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit6Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit6Pressed(KeyEvent event) This handler is called when the digit '6' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit7Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit7Pressed(KeyEvent event) This handler is called when the digit '7' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit8Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit8Pressed(KeyEvent event) This handler is called when the digit '8' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDigit9Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDigit9Pressed(KeyEvent event) This handler is called when the digit '9' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onLeftPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onLeftPressed(KeyEvent event) This handler is called when the Left arrow has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onRightPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onRightPressed(KeyEvent event) This handler is called when the Right arrow has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onUpPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onUpPressed(KeyEvent event) This handler is called when the Up arrow has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDownPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDownPressed(KeyEvent event) This handler is called when the Down arrow has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onTabPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onTabPressed(KeyEvent event) This handler is called when the Tab key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onBacktabPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onBacktabPressed(KeyEvent event) This handler is called when the Shift+Tab key combination (Backtab) has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onAsteriskPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onAsteriskPressed(KeyEvent event) This handler is called when the Asterisk '*' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onEscapePressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onEscapePressed(KeyEvent event) This handler is called when the Escape key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onReturnPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onReturnPressed(KeyEvent event) This handler is called when the Return key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onEnterPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onEnterPressed(KeyEvent event) This handler is called when the Enter key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onDeletePressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onDeletePressed(KeyEvent event) This handler is called when the Delete key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onSpacePressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onSpacePressed(KeyEvent event) This handler is called when the Space key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onBackPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onBackPressed(KeyEvent event) This handler is called when the Back key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onCancelPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onCancelPressed(KeyEvent event) This handler is called when the Cancel key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onSelectPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onSelectPressed(KeyEvent event) This handler is called when the Select key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onYesPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onYesPressed(KeyEvent event) This handler is called when the Yes key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onNoPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onNoPressed(KeyEvent event) This handler is called when the No key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onContext1Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onContext1Pressed(KeyEvent event) This handler is called when the Context1 key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onContext2Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onContext2Pressed(KeyEvent event) This handler is called when the Context2 key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onContext3Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onContext3Pressed(KeyEvent event) This handler is called when the Context3 key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onContext4Pressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onContext4Pressed(KeyEvent event) This handler is called when the Context4 key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onCallPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onCallPressed(KeyEvent event) This handler is called when the Call key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onHangupPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onHangupPressed(KeyEvent event) This handler is called when the Hangup key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onFlipPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onFlipPressed(KeyEvent event) This handler is called when the Flip key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onMenuPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onMenuPressed(KeyEvent event) This handler is called when the Menu key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onVolumeUpPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onVolumeUpPressed(KeyEvent event) This handler is called when the VolumeUp key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal Keys::onVolumeDownPressed(KeyEvent event) + \qmlsignal QtQuick1::Keys::onVolumeDownPressed(KeyEvent event) This handler is called when the VolumeDown key has been pressed. The \a event parameter provides information about the event. @@ -1548,7 +1555,7 @@ QDeclarative1KeysAttached *QDeclarative1KeysAttached::qmlAttachedProperties(QObj /*! \class QDeclarativeItem - \since 4.7 + \since QtQuick 1.0 \brief The QDeclarativeItem class provides the most basic of all visual items in QML. All visual items in Qt Declarative inherit from QDeclarativeItem. Although QDeclarativeItem @@ -1565,8 +1572,9 @@ QDeclarative1KeysAttached *QDeclarative1KeysAttached::qmlAttachedProperties(QObj /*! \qmlclass Item QDeclarativeItem + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements - \since 4.7 + \since QtQuick 1.0 \brief The Item is the most basic of all visual items in QML. All visual items in Qt Declarative inherit from Item. Although Item @@ -1737,7 +1745,7 @@ QDeclarativeItem::~QDeclarativeItem() } /*! - \qmlproperty enumeration Item::transformOrigin + \qmlproperty enumeration QtQuick1::Item::transformOrigin This property holds the origin point around which scale and rotation transform. Nine transform origins are available, as shown in the image below. @@ -1760,7 +1768,7 @@ QDeclarativeItem::~QDeclarativeItem() */ /*! - \qmlproperty Item Item::parent + \qmlproperty Item QtQuick1::Item::parent This property holds the parent of the item. */ @@ -1782,10 +1790,10 @@ QDeclarativeItem *QDeclarativeItem::parentItem() const } /*! - \qmlproperty real Item::childrenRect.x - \qmlproperty real Item::childrenRect.y - \qmlproperty real Item::childrenRect.width - \qmlproperty real Item::childrenRect.height + \qmlproperty real QtQuick1::Item::childrenRect.x + \qmlproperty real QtQuick1::Item::childrenRect.y + \qmlproperty real QtQuick1::Item::childrenRect.width + \qmlproperty real QtQuick1::Item::childrenRect.height The childrenRect properties allow an item access to the geometry of its children. This property is useful if you have an item that needs to be @@ -1794,8 +1802,8 @@ QDeclarativeItem *QDeclarativeItem::parentItem() const /*! - \qmlproperty list<Item> Item::children - \qmlproperty list<Object> Item::resources + \qmlproperty list<Item> QtQuick1::Item::children + \qmlproperty list<Object> QtQuick1::Item::resources The children property contains the list of visual children of this item. The resources property contains non-visual resources that you want to @@ -1986,7 +1994,7 @@ void QDeclarativeItemPrivate::parentProperty(QObject *o, void *rv, QDeclarativeN } /*! - \qmlproperty list<Object> Item::data + \qmlproperty list<Object> QtQuick1::Item::data \default The data property allows you to freely mix visual children and resources @@ -2059,10 +2067,10 @@ void QDeclarativeItem::setClip(bool c) } /*! - \qmlproperty real Item::x - \qmlproperty real Item::y - \qmlproperty real Item::width - \qmlproperty real Item::height + \qmlproperty real QtQuick1::Item::x + \qmlproperty real QtQuick1::Item::y + \qmlproperty real QtQuick1::Item::width + \qmlproperty real QtQuick1::Item::height Defines the item's position and size relative to its parent. @@ -2072,7 +2080,7 @@ void QDeclarativeItem::setClip(bool c) */ /*! - \qmlproperty real Item::z + \qmlproperty real QtQuick1::Item::z Sets the stacking order of sibling items. By default the stacking order is 0. @@ -2150,7 +2158,7 @@ void QDeclarativeItem::setClip(bool c) */ /*! - \qmlproperty bool Item::visible + \qmlproperty bool QtQuick1::Item::visible This property holds whether the item is visible. By default this is true. @@ -2367,27 +2375,27 @@ QDeclarative1AnchorLine QDeclarativeItemPrivate::baseline() const } /*! - \qmlproperty AnchorLine Item::anchors.top - \qmlproperty AnchorLine Item::anchors.bottom - \qmlproperty AnchorLine Item::anchors.left - \qmlproperty AnchorLine Item::anchors.right - \qmlproperty AnchorLine Item::anchors.horizontalCenter - \qmlproperty AnchorLine Item::anchors.verticalCenter - \qmlproperty AnchorLine Item::anchors.baseline + \qmlproperty AnchorLine QtQuick1::Item::anchors.top + \qmlproperty AnchorLine QtQuick1::Item::anchors.bottom + \qmlproperty AnchorLine QtQuick1::Item::anchors.left + \qmlproperty AnchorLine QtQuick1::Item::anchors.right + \qmlproperty AnchorLine QtQuick1::Item::anchors.horizontalCenter + \qmlproperty AnchorLine QtQuick1::Item::anchors.verticalCenter + \qmlproperty AnchorLine QtQuick1::Item::anchors.baseline - \qmlproperty Item Item::anchors.fill - \qmlproperty Item Item::anchors.centerIn + \qmlproperty Item QtQuick1::Item::anchors.fill + \qmlproperty Item QtQuick1::Item::anchors.centerIn - \qmlproperty real Item::anchors.margins - \qmlproperty real Item::anchors.topMargin - \qmlproperty real Item::anchors.bottomMargin - \qmlproperty real Item::anchors.leftMargin - \qmlproperty real Item::anchors.rightMargin - \qmlproperty real Item::anchors.horizontalCenterOffset - \qmlproperty real Item::anchors.verticalCenterOffset - \qmlproperty real Item::anchors.baselineOffset + \qmlproperty real QtQuick1::Item::anchors.margins + \qmlproperty real QtQuick1::Item::anchors.topMargin + \qmlproperty real QtQuick1::Item::anchors.bottomMargin + \qmlproperty real QtQuick1::Item::anchors.leftMargin + \qmlproperty real QtQuick1::Item::anchors.rightMargin + \qmlproperty real QtQuick1::Item::anchors.horizontalCenterOffset + \qmlproperty real QtQuick1::Item::anchors.verticalCenterOffset + \qmlproperty real QtQuick1::Item::anchors.baselineOffset - \qmlproperty bool Item::anchors.mirrored + \qmlproperty bool QtQuick1::Item::anchors.mirrored Anchors provide a way to position an item by specifying its relationship with other items. @@ -2492,7 +2500,7 @@ void QDeclarativeItem::setBaselineOffset(qreal offset) } /*! - \qmlproperty real Item::rotation + \qmlproperty real QtQuick1::Item::rotation This property holds the rotation of the item in degrees clockwise. This specifies how many degrees to rotate the item around its transformOrigin. @@ -2519,7 +2527,7 @@ void QDeclarativeItem::setBaselineOffset(qreal offset) */ /*! - \qmlproperty real Item::scale + \qmlproperty real QtQuick1::Item::scale This property holds the scale of the item. A scale of less than 1 means the item will be displayed smaller than @@ -2557,7 +2565,7 @@ void QDeclarativeItem::setBaselineOffset(qreal offset) */ /*! - \qmlproperty real Item::opacity + \qmlproperty real QtQuick1::Item::opacity This property holds the opacity of the item. Opacity is specified as a number between 0 (fully transparent) and 1 (fully opaque). The default is 1. @@ -2647,7 +2655,7 @@ void QDeclarativeItem::setKeepMouseGrab(bool keep) } /*! - \qmlmethod object Item::mapFromItem(Item item, real x, real y) + \qmlmethod object QtQuick1::Item::mapFromItem(Item item, real x, real y) Maps the point (\a x, \a y), which is in \a item's coordinate system, to this item's coordinate system, and returns an object with \c x and \c y @@ -2686,7 +2694,7 @@ void QDeclarativeItem::mapFromItem(QDeclarativeV8Function *args) const } /*! - \qmlmethod object Item::mapToItem(Item item, real x, real y) + \qmlmethod object QtQuick1::Item::mapToItem(Item item, real x, real y) Maps the point (\a x, \a y), which is in this item's coordinate system, to \a item's coordinate system, and returns an object with \c x and \c y @@ -2725,7 +2733,7 @@ void QDeclarativeItem::mapToItem(QDeclarativeV8Function *args) const } /*! - \qmlmethod Item::forceActiveFocus() + \qmlmethod QtQuick1::Item::forceActiveFocus() Forces active focus on the item. @@ -2752,7 +2760,7 @@ void QDeclarativeItem::forceActiveFocus() /*! - \qmlmethod Item::childAt(real x, real y) + \qmlmethod QtQuick1::Item::childAt(real x, real y) Returns the visible child item at point (\a x, \a y), which is in this item's coordinate system, or \c null if there is no such item. @@ -2795,7 +2803,7 @@ QDeclarativeListProperty<QObject> QDeclarativeItemPrivate::resources() } /*! - \qmlproperty list<State> Item::states + \qmlproperty list<State> QtQuick1::Item::states This property holds a list of states defined by the item. \qml @@ -2821,7 +2829,7 @@ QDeclarativeListProperty<QDeclarative1State> QDeclarativeItemPrivate::states() } /*! - \qmlproperty list<Transition> Item::transitions + \qmlproperty list<Transition> QtQuick1::Item::transitions This property holds a list of transitions defined by the item. \qml @@ -2848,7 +2856,7 @@ QDeclarativeListProperty<QDeclarative1Transition> QDeclarativeItemPrivate::trans } /* - \qmlproperty list<Filter> Item::filter + \qmlproperty list<Filter> QtQuick1::Item::filter This property holds a list of graphical filters to be applied to the item. \l {Filter}{Filters} include things like \l {Blur}{blurring} @@ -2873,7 +2881,7 @@ QDeclarativeListProperty<QDeclarative1Transition> QDeclarativeItemPrivate::trans */ /*! - \qmlproperty bool Item::clip + \qmlproperty bool QtQuick1::Item::clip This property holds whether clipping is enabled. The default clip value is \c false. If clipping is enabled, an item will clip its own painting, as well @@ -2895,7 +2903,7 @@ QDeclarativeListProperty<QDeclarative1Transition> QDeclarativeItemPrivate::trans */ /*! - \qmlproperty string Item::state + \qmlproperty string QtQuick1::Item::state This property holds the name of the current state of the item. @@ -2932,7 +2940,7 @@ void QDeclarativeItemPrivate::setState(const QString &state) } /*! - \qmlproperty list<Transform> Item::transform + \qmlproperty list<Transform> QtQuick1::Item::transform This property holds the list of transformations to apply. For more information see \l Transform. @@ -3534,8 +3542,8 @@ qreal QDeclarativeItem::implicitHeight() const } /*! - \qmlproperty real Item::implicitWidth - \qmlproperty real Item::implicitHeight + \qmlproperty real QtQuick1::Item::implicitWidth + \qmlproperty real QtQuick1::Item::implicitHeight \since Quick 1.1 Defines the natural width or height of the Item if no \l width or \l height is specified. @@ -3628,7 +3636,7 @@ void QDeclarativeItem::setSize(const QSizeF &size) } /*! - \qmlproperty bool Item::activeFocus + \qmlproperty bool QtQuick1::Item::activeFocus This property indicates whether the item has active focus. @@ -3661,7 +3669,7 @@ bool QDeclarativeItem::hasActiveFocus() const } /*! - \qmlproperty bool Item::focus + \qmlproperty bool QtQuick1::Item::focus This property indicates whether the item has focus within the enclosing focus scope. If true, this item will gain active focus when the enclosing focus scope gains active focus. In the following example, \c input will be given active focus when \c scope gains active focus. diff --git a/src/qtquick1/graphicsitems/qdeclarativelayoutitem.cpp b/src/qtquick1/graphicsitems/qdeclarativelayoutitem.cpp index eea3830fca..8d6cf6145a 100644 --- a/src/qtquick1/graphicsitems/qdeclarativelayoutitem.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativelayoutitem.cpp @@ -51,8 +51,9 @@ QT_BEGIN_NAMESPACE /*! \qmlclass LayoutItem QDeclarative1LayoutItem + \inqmlmodule QtQuick 1 \ingroup qml-utility-elements - \since 4.7 + \since QtQuick 1.0 \brief The LayoutItem element allows declarative UI elements to be placed inside Qt's Graphics View layouts. LayoutItem is a variant of \l Item with additional size hint properties. These properties provide the size hints @@ -68,19 +69,19 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty QSizeF LayoutItem::maximumSize + \qmlproperty QSizeF QtQuick1::LayoutItem::maximumSize The maximumSize property can be set to specify the maximum desired size of this LayoutItem */ /*! - \qmlproperty QSizeF LayoutItem::minimumSize + \qmlproperty QSizeF QtQuick1::LayoutItem::minimumSize The minimumSize property can be set to specify the minimum desired size of this LayoutItem */ /*! - \qmlproperty QSizeF LayoutItem::preferredSize + \qmlproperty QSizeF QtQuick1::LayoutItem::preferredSize The preferredSize property can be set to specify the preferred size of this LayoutItem */ diff --git a/src/qtquick1/graphicsitems/qdeclarativelistview.cpp b/src/qtquick1/graphicsitems/qdeclarativelistview.cpp index 42f1e1919b..1e6a4a039c 100644 --- a/src/qtquick1/graphicsitems/qdeclarativelistview.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativelistview.cpp @@ -1545,8 +1545,9 @@ void QDeclarative1ListViewPrivate::flick(AxisData &data, qreal minExtent, qreal /*! \qmlclass ListView QDeclarative1ListView + \inqmlmodule QtQuick 1 \ingroup qml-view-elements - \since 4.7 + \since QtQuick 1.0 \inherits Flickable \brief The ListView item provides a list view of items provided by a model. @@ -1684,17 +1685,17 @@ QDeclarative1ListView::~QDeclarative1ListView() */ /*! - \qmlattachedsignal ListView::onAdd() + \qmlattachedsignal QtQuick1::ListView::onAdd() This attached handler is called immediately after an item is added to the view. */ /*! - \qmlattachedsignal ListView::onRemove() + \qmlattachedsignal QtQuick1::ListView::onRemove() This attached handler is called immediately before an item is removed from the view. */ /*! - \qmlproperty model ListView::model + \qmlproperty model QtQuick1::ListView::model This property holds the model providing data for the list. The model provides the set of data that is used to create the items @@ -1778,7 +1779,7 @@ void QDeclarative1ListView::setModel(const QVariant &model) } /*! - \qmlproperty Component ListView::delegate + \qmlproperty Component QtQuick1::ListView::delegate The delegate provides a template defining each item instantiated by the view. The index is exposed as an accessible \c index property. Properties of the @@ -1845,8 +1846,8 @@ void QDeclarative1ListView::setDelegate(QDeclarativeComponent *delegate) } /*! - \qmlproperty int ListView::currentIndex - \qmlproperty Item ListView::currentItem + \qmlproperty int QtQuick1::ListView::currentIndex + \qmlproperty Item QtQuick1::ListView::currentItem The \c currentIndex property holds the index of the current item, and \c currentItem holds the current item. Setting the currentIndex to -1 @@ -1891,7 +1892,7 @@ QDeclarativeItem *QDeclarative1ListView::currentItem() } /*! - \qmlproperty Item ListView::highlightItem + \qmlproperty Item QtQuick1::ListView::highlightItem This holds the highlight item created from the \l highlight component. @@ -1909,7 +1910,7 @@ QDeclarativeItem *QDeclarative1ListView::highlightItem() } /*! - \qmlproperty int ListView::count + \qmlproperty int QtQuick1::ListView::count This property holds the number of items in the view. */ int QDeclarative1ListView::count() const @@ -1921,7 +1922,7 @@ int QDeclarative1ListView::count() const } /*! - \qmlproperty Component ListView::highlight + \qmlproperty Component QtQuick1::ListView::highlight This property holds the component to use as the highlight. An instance of the highlight component is created for each list. @@ -1950,7 +1951,7 @@ void QDeclarative1ListView::setHighlight(QDeclarativeComponent *highlight) } /*! - \qmlproperty bool ListView::highlightFollowsCurrentItem + \qmlproperty bool QtQuick1::ListView::highlightFollowsCurrentItem This property holds whether the highlight is managed by the view. If this property is true (the default value), the highlight is moved smoothly @@ -1993,9 +1994,9 @@ void QDeclarative1ListView::setHighlightFollowsCurrentItem(bool autoHighlight) //###Possibly rename these properties, since they are very useful even without a highlight? /*! - \qmlproperty real ListView::preferredHighlightBegin - \qmlproperty real ListView::preferredHighlightEnd - \qmlproperty enumeration ListView::highlightRangeMode + \qmlproperty real QtQuick1::ListView::preferredHighlightBegin + \qmlproperty real QtQuick1::ListView::preferredHighlightEnd + \qmlproperty enumeration QtQuick1::ListView::highlightRangeMode These properties define the preferred range of the highlight (for the current item) within the view. The \c preferredHighlightBegin value must be less than the @@ -2093,7 +2094,7 @@ void QDeclarative1ListView::setHighlightRangeMode(HighlightRangeMode mode) } /*! - \qmlproperty real ListView::spacing + \qmlproperty real QtQuick1::ListView::spacing This property holds the spacing between items. @@ -2116,7 +2117,7 @@ void QDeclarative1ListView::setSpacing(qreal spacing) } /*! - \qmlproperty enumeration ListView::orientation + \qmlproperty enumeration QtQuick1::ListView::orientation This property holds the orientation of the list. Possible values: @@ -2162,7 +2163,7 @@ void QDeclarative1ListView::setOrientation(QDeclarative1ListView::Orientation or } /*! - \qmlproperty enumeration ListView::layoutDirection + \qmlproperty enumeration QtQuick1::ListView::layoutDirection This property holds the layout direction of the horizontal list. Possible values: @@ -2193,7 +2194,7 @@ void QDeclarative1ListView::setLayoutDirection(Qt::LayoutDirection layoutDirecti } /*! - \qmlproperty enumeration ListView::effectiveLayoutDirection + \qmlproperty enumeration QtQuick1::ListView::effectiveLayoutDirection This property holds the effective layout direction of the horizontal list. When using the attached property \l {LayoutMirroring::enabled}{LayoutMirroring::enabled} for locale layouts, @@ -2213,7 +2214,7 @@ Qt::LayoutDirection QDeclarative1ListView::effectiveLayoutDirection() const } /*! - \qmlproperty bool ListView::keyNavigationWraps + \qmlproperty bool QtQuick1::ListView::keyNavigationWraps This property holds whether the list wraps key navigation. If this is true, key navigation that would move the current item selection @@ -2238,7 +2239,7 @@ void QDeclarative1ListView::setWrapEnabled(bool wrap) } /*! - \qmlproperty int ListView::cacheBuffer + \qmlproperty int QtQuick1::ListView::cacheBuffer This property determines whether delegates are retained outside the visible area of the view. @@ -2276,9 +2277,9 @@ void QDeclarative1ListView::setCacheBuffer(int b) } /*! - \qmlproperty string ListView::section.property - \qmlproperty enumeration ListView::section.criteria - \qmlproperty Component ListView::section.delegate + \qmlproperty string QtQuick1::ListView::section.property + \qmlproperty enumeration QtQuick1::ListView::section.criteria + \qmlproperty Component QtQuick1::ListView::section.delegate These properties hold the expression to be evaluated for the \l section attached property. @@ -2337,7 +2338,7 @@ QDeclarative1ViewSection *QDeclarative1ListView::sectionCriteria() } /*! - \qmlproperty string ListView::currentSection + \qmlproperty string QtQuick1::ListView::currentSection This property holds the section that is currently at the beginning of the view. */ QString QDeclarative1ListView::currentSection() const @@ -2347,10 +2348,10 @@ QString QDeclarative1ListView::currentSection() const } /*! - \qmlproperty real ListView::highlightMoveSpeed - \qmlproperty int ListView::highlightMoveDuration - \qmlproperty real ListView::highlightResizeSpeed - \qmlproperty int ListView::highlightResizeDuration + \qmlproperty real QtQuick1::ListView::highlightMoveSpeed + \qmlproperty int QtQuick1::ListView::highlightMoveDuration + \qmlproperty real QtQuick1::ListView::highlightResizeSpeed + \qmlproperty int QtQuick1::ListView::highlightResizeDuration These properties hold the move and resize animation speed of the highlight delegate. @@ -2434,7 +2435,7 @@ void QDeclarative1ListView::setHighlightResizeDuration(int duration) } /*! - \qmlproperty enumeration ListView::snapMode + \qmlproperty enumeration QtQuick1::ListView::snapMode This property determines how the view scrolling will settle following a drag or flick. The possible values are: @@ -2470,7 +2471,7 @@ void QDeclarative1ListView::setSnapMode(SnapMode mode) } /*! - \qmlproperty Component ListView::footer + \qmlproperty Component QtQuick1::ListView::footer This property holds the component to use as the footer. An instance of the footer component is created for each view. The @@ -2508,7 +2509,7 @@ void QDeclarative1ListView::setFooter(QDeclarativeComponent *footer) } /*! - \qmlproperty Component ListView::header + \qmlproperty Component QtQuick1::ListView::header This property holds the component to use as the header. An instance of the header component is created for each view. The @@ -2853,7 +2854,7 @@ void QDeclarative1ListView::geometryChanged(const QRectF &newGeometry, /*! - \qmlmethod ListView::incrementCurrentIndex() + \qmlmethod QtQuick1::ListView::incrementCurrentIndex() Increments the current index. The current index will wrap if keyNavigationWraps is true and it is currently at the end. @@ -2873,7 +2874,7 @@ void QDeclarative1ListView::incrementCurrentIndex() } /*! - \qmlmethod ListView::decrementCurrentIndex() + \qmlmethod QtQuick1::ListView::decrementCurrentIndex() Decrements the current index. The current index will wrap if keyNavigationWraps is true and it is currently at the beginning. @@ -2975,7 +2976,7 @@ void QDeclarative1ListViewPrivate::positionViewAtIndex(int index, int mode) } /*! - \qmlmethod ListView::positionViewAtIndex(int index, PositionMode mode) + \qmlmethod QtQuick1::ListView::positionViewAtIndex(int index, PositionMode mode) Positions the view such that the \a index is at the position specified by \a mode: @@ -3016,8 +3017,8 @@ void QDeclarative1ListView::positionViewAtIndex(int index, int mode) } /*! - \qmlmethod ListView::positionViewAtBeginning() - \qmlmethod ListView::positionViewAtEnd() + \qmlmethod QtQuick1::ListView::positionViewAtBeginning() + \qmlmethod QtQuick1::ListView::positionViewAtEnd() \since Quick 1.1 Positions the view at the beginning or end, taking into account any header or footer. @@ -3052,7 +3053,7 @@ void QDeclarative1ListView::positionViewAtEnd() } /*! - \qmlmethod int ListView::indexAt(int x, int y) + \qmlmethod int QtQuick1::ListView::indexAt(int x, int y) Returns the index of the visible item containing the point \a x, \a y in content coordinates. If there is no item at the point specified, or the item is diff --git a/src/qtquick1/graphicsitems/qdeclarativeloader.cpp b/src/qtquick1/graphicsitems/qdeclarativeloader.cpp index 92b34d7001..7162c31662 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeloader.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeloader.cpp @@ -120,8 +120,9 @@ void QDeclarative1LoaderPrivate::initResize() /*! \qmlclass Loader QDeclarative1Loader + \inqmlmodule QtQuick 1 \ingroup qml-utility-elements - \since 4.7 + \since QtQuick 1.0 \inherits Item \brief The Loader item allows dynamically loading an Item-based @@ -247,7 +248,7 @@ QDeclarative1Loader::~QDeclarative1Loader() } /*! - \qmlproperty url Loader::source + \qmlproperty url QtQuick1::Loader::source This property holds the URL of the QML component to instantiate. Note the QML component must be an \l{Item}-based component. The loader @@ -291,7 +292,7 @@ void QDeclarative1Loader::setSource(const QUrl &url) } /*! - \qmlproperty Component Loader::sourceComponent + \qmlproperty Component QtQuick1::Loader::sourceComponent This property holds the \l{Component} to instantiate. \qml @@ -427,7 +428,7 @@ void QDeclarative1LoaderPrivate::_q_sourceLoaded() } /*! - \qmlproperty enumeration Loader::status + \qmlproperty enumeration QtQuick1::Loader::status This property holds the status of QML loading. It can be one of: \list @@ -489,7 +490,7 @@ void QDeclarative1Loader::componentComplete() /*! - \qmlsignal Loader::onLoaded() + \qmlsignal QtQuick1::Loader::onLoaded() This handler is called when the \l status becomes \c Loader.Ready, or on successful initial load. @@ -497,7 +498,7 @@ void QDeclarative1Loader::componentComplete() /*! -\qmlproperty real Loader::progress +\qmlproperty real QtQuick1::Loader::progress This property holds the progress of loading QML data from the network, from 0.0 (nothing loaded) to 1.0 (finished). Most QML files are quite small, so @@ -554,7 +555,7 @@ void QDeclarative1LoaderPrivate::_q_updateSize(bool loaderGeometryChanged) } /*! - \qmlproperty Item Loader::item + \qmlproperty Item QtQuick1::Loader::item This property holds the top-level item that is currently loaded. */ QGraphicsObject *QDeclarative1Loader::item() const diff --git a/src/qtquick1/graphicsitems/qdeclarativemousearea.cpp b/src/qtquick1/graphicsitems/qdeclarativemousearea.cpp index 6cd41ff615..e6c22d2fbb 100644 --- a/src/qtquick1/graphicsitems/qdeclarativemousearea.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativemousearea.cpp @@ -182,8 +182,9 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() /*! \qmlclass MouseArea QDeclarative1MouseArea + \inqmlmodule QtQuick 1 \ingroup qml-basic-interaction-elements - \since 4.7 + \since QtQuick 1.0 \brief The MouseArea item enables simple mouse handling. \inherits Item @@ -243,7 +244,7 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() */ /*! - \qmlsignal MouseArea::onEntered() + \qmlsignal QtQuick1::MouseArea::onEntered() This handler is called when the mouse enters the mouse area. @@ -255,7 +256,7 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() */ /*! - \qmlsignal MouseArea::onExited() + \qmlsignal QtQuick1::MouseArea::onExited() This handler is called when the mouse exists the mouse area. @@ -267,7 +268,7 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() */ /*! - \qmlsignal MouseArea::onPositionChanged(MouseEvent mouse) + \qmlsignal QtQuick1::MouseArea::onPositionChanged(MouseEvent mouse) This handler is called when the mouse position changes. @@ -282,7 +283,7 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() */ /*! - \qmlsignal MouseArea::onClicked(MouseEvent mouse) + \qmlsignal QtQuick1::MouseArea::onClicked(MouseEvent mouse) This handler is called when there is a click. A click is defined as a press followed by a release, both inside the MouseArea (pressing, moving outside the MouseArea, and then moving back inside and @@ -295,7 +296,7 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() */ /*! - \qmlsignal MouseArea::onPressed(MouseEvent mouse) + \qmlsignal QtQuick1::MouseArea::onPressed(MouseEvent mouse) This handler is called when there is a press. The \l {MouseEvent}{mouse} parameter provides information about the press, including the x and y @@ -309,7 +310,7 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() */ /*! - \qmlsignal MouseArea::onReleased(MouseEvent mouse) + \qmlsignal QtQuick1::MouseArea::onReleased(MouseEvent mouse) This handler is called when there is a release. The \l {MouseEvent}{mouse} parameter provides information about the click, including the x and y @@ -321,7 +322,7 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() */ /*! - \qmlsignal MouseArea::onPressAndHold(MouseEvent mouse) + \qmlsignal QtQuick1::MouseArea::onPressAndHold(MouseEvent mouse) This handler is called when there is a long press (currently 800ms). The \l {MouseEvent}{mouse} parameter provides information about the press, including the x and y @@ -331,7 +332,7 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() */ /*! - \qmlsignal MouseArea::onDoubleClicked(MouseEvent mouse) + \qmlsignal QtQuick1::MouseArea::onDoubleClicked(MouseEvent mouse) This handler is called when there is a double-click (a press followed by a release followed by a press). The \l {MouseEvent}{mouse} parameter provides information about the click, including the x and y @@ -343,7 +344,7 @@ QDeclarative1MouseAreaPrivate::~QDeclarative1MouseAreaPrivate() */ /*! - \qmlsignal MouseArea::onCanceled() + \qmlsignal QtQuick1::MouseArea::onCanceled() This handler is called when mouse events have been canceled, either because an event was not accepted, or because another element stole the mouse event handling. @@ -368,8 +369,8 @@ QDeclarative1MouseArea::~QDeclarative1MouseArea() } /*! - \qmlproperty real MouseArea::mouseX - \qmlproperty real MouseArea::mouseY + \qmlproperty real QtQuick1::MouseArea::mouseX + \qmlproperty real QtQuick1::MouseArea::mouseY These properties hold the coordinates of the mouse cursor. If the hoverEnabled property is false then these properties will only be valid @@ -399,7 +400,7 @@ qreal QDeclarative1MouseArea::mouseY() const } /*! - \qmlproperty bool MouseArea::enabled + \qmlproperty bool QtQuick1::MouseArea::enabled This property holds whether the item accepts mouse events. By default, this property is true. @@ -420,7 +421,7 @@ void QDeclarative1MouseArea::setEnabled(bool a) } /*! - \qmlproperty bool MouseArea::preventStealing + \qmlproperty bool QtQuick1::MouseArea::preventStealing \since Quick 1.1 This property holds whether the mouse events may be stolen from this MouseArea. @@ -453,7 +454,7 @@ void QDeclarative1MouseArea::setPreventStealing(bool prevent) } /*! - \qmlproperty MouseButtons MouseArea::pressedButtons + \qmlproperty MouseButtons QtQuick1::MouseArea::pressedButtons This property holds the mouse buttons currently pressed. It contains a bitwise combination of: @@ -819,7 +820,7 @@ QVariant QDeclarative1MouseArea::itemChange(GraphicsItemChange change, } /*! - \qmlproperty bool MouseArea::hoverEnabled + \qmlproperty bool QtQuick1::MouseArea::hoverEnabled This property holds whether hover events are handled. By default, mouse events are only handled in response to a button event, or when a button is @@ -847,7 +848,7 @@ void QDeclarative1MouseArea::setHoverEnabled(bool h) } /*! - \qmlproperty bool MouseArea::containsMouse + \qmlproperty bool QtQuick1::MouseArea::containsMouse This property holds whether the mouse is currently inside the mouse area. \warning This property is not updated if the area moves under the mouse: \e containsMouse will not change. @@ -860,7 +861,7 @@ bool QDeclarative1MouseArea::hovered() const } /*! - \qmlproperty bool MouseArea::pressed + \qmlproperty bool QtQuick1::MouseArea::pressed This property holds whether the mouse area is currently pressed. */ bool QDeclarative1MouseArea::pressed() const @@ -880,7 +881,7 @@ void QDeclarative1MouseArea::setHovered(bool h) } /*! - \qmlproperty Qt::MouseButtons MouseArea::acceptedButtons + \qmlproperty QtQuick1::Qt::MouseButtons MouseArea::acceptedButtons This property holds the mouse buttons that the mouse area reacts to. The available buttons are: @@ -951,14 +952,14 @@ QDeclarative1Drag *QDeclarative1MouseArea::drag() } /*! - \qmlproperty Item MouseArea::drag.target - \qmlproperty bool MouseArea::drag.active - \qmlproperty enumeration MouseArea::drag.axis - \qmlproperty real MouseArea::drag.minimumX - \qmlproperty real MouseArea::drag.maximumX - \qmlproperty real MouseArea::drag.minimumY - \qmlproperty real MouseArea::drag.maximumY - \qmlproperty bool MouseArea::drag.filterChildren + \qmlproperty Item QtQuick1::MouseArea::drag.target + \qmlproperty bool QtQuick1::MouseArea::drag.active + \qmlproperty enumeration QtQuick1::MouseArea::drag.axis + \qmlproperty real QtQuick1::MouseArea::drag.minimumX + \qmlproperty real QtQuick1::MouseArea::drag.maximumX + \qmlproperty real QtQuick1::MouseArea::drag.minimumY + \qmlproperty real QtQuick1::MouseArea::drag.maximumY + \qmlproperty bool QtQuick1::MouseArea::drag.filterChildren \c drag provides a convenient way to make an item draggable. diff --git a/src/qtquick1/graphicsitems/qdeclarativepainteditem.cpp b/src/qtquick1/graphicsitems/qdeclarativepainteditem.cpp index 396aed2160..3f743755a2 100644 --- a/src/qtquick1/graphicsitems/qdeclarativepainteditem.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativepainteditem.cpp @@ -399,7 +399,7 @@ void QDeclarative1PaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem } /*! - \qmlproperty int PaintedItem::pixelCacheSize + \qmlproperty int QtQuick1::PaintedItem::pixelCacheSize This property holds the maximum number of pixels of image cache to allow. The default is 0.1 megapixels. The cache will not be larger @@ -472,7 +472,7 @@ QColor QDeclarative1PaintedItem::fillColor() const } /*! - \qmlproperty bool PaintedItem::smoothCache + \qmlproperty bool QtQuick1::PaintedItem::smoothCache Controls whether the cached tiles of which the item is composed are rendered smoothly when they are generated. diff --git a/src/qtquick1/graphicsitems/qdeclarativepath.cpp b/src/qtquick1/graphicsitems/qdeclarativepath.cpp index 9328f2c5dd..ecf9e24e2f 100644 --- a/src/qtquick1/graphicsitems/qdeclarativepath.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativepath.cpp @@ -55,8 +55,9 @@ QT_BEGIN_NAMESPACE /*! \qmlclass PathElement QDeclarative1PathElement + \inqmlmodule QtQuick 1 \ingroup qml-view-elements - \since 4.7 + \since QtQuick 1.0 \brief PathElement is the base path type. This type is the base for all path types. It cannot @@ -67,8 +68,9 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Path QDeclarative1Path + \inqmlmodule QtQuick 1 \ingroup qml-view-elements - \since 4.7 + \since QtQuick 1.0 \brief A Path object defines a path for use by \l PathView. A Path is composed of one or more path segments - PathLine, PathQuad, @@ -92,8 +94,8 @@ QDeclarative1Path::~QDeclarative1Path() } /*! - \qmlproperty real Path::startX - \qmlproperty real Path::startY + \qmlproperty real QtQuick1::Path::startX + \qmlproperty real QtQuick1::Path::startY These properties hold the starting position of the path. */ qreal QDeclarative1Path::startX() const @@ -129,7 +131,7 @@ void QDeclarative1Path::setStartY(qreal y) } /*! - \qmlproperty bool Path::closed + \qmlproperty bool QtQuick1::Path::closed This property holds whether the start and end of the path are identical. */ bool QDeclarative1Path::isClosed() const @@ -139,7 +141,7 @@ bool QDeclarative1Path::isClosed() const } /*! - \qmlproperty list<PathElement> Path::pathElements + \qmlproperty list<PathElement> QtQuick1::Path::pathElements This property holds the objects composing the path. \default @@ -495,8 +497,9 @@ void QDeclarative1Curve::setY(qreal y) /*! \qmlclass PathAttribute QDeclarative1PathAttribute + \inqmlmodule QtQuick 1 \ingroup qml-view-elements - \since 4.7 + \since QtQuick 1.0 \brief The PathAttribute allows setting an attribute at a given position in a Path. The PathAttribute object allows attributes consisting of a name and @@ -526,7 +529,7 @@ void QDeclarative1Curve::setY(qreal y) */ /*! - \qmlproperty string PathAttribute::name + \qmlproperty string QtQuick1::PathAttribute::name This property holds the name of the attribute to change. This attribute will be available to the delegate as PathView.<name> @@ -555,7 +558,7 @@ void QDeclarative1PathAttribute::setName(const QString &name) } /*! - \qmlproperty real PathAttribute::value + \qmlproperty real QtQuick1::PathAttribute::value This property holds the value for the attribute. The value specified can be used to influence the visual appearance @@ -611,8 +614,9 @@ void QDeclarative1PathAttribute::setValue(qreal value) /*! \qmlclass PathLine QDeclarative1PathLine + \inqmlmodule QtQuick 1 \ingroup qml-view-elements - \since 4.7 + \since QtQuick 1.0 \brief The PathLine defines a straight line. The example below creates a path consisting of a straight line from @@ -629,8 +633,8 @@ void QDeclarative1PathAttribute::setValue(qreal value) */ /*! - \qmlproperty real PathLine::x - \qmlproperty real PathLine::y + \qmlproperty real QtQuick1::PathLine::x + \qmlproperty real QtQuick1::PathLine::y Defines the end point of the line. */ @@ -644,8 +648,9 @@ void QDeclarative1PathLine::addToPath(QPainterPath &path) /*! \qmlclass PathQuad QDeclarative1PathQuad + \inqmlmodule QtQuick 1 \ingroup qml-view-elements - \since 4.7 + \since QtQuick 1.0 \brief The PathQuad defines a quadratic Bezier curve with a control point. The following QML produces the path shown below: @@ -665,15 +670,15 @@ void QDeclarative1PathLine::addToPath(QPainterPath &path) */ /*! - \qmlproperty real PathQuad::x - \qmlproperty real PathQuad::y + \qmlproperty real QtQuick1::PathQuad::x + \qmlproperty real QtQuick1::PathQuad::y Defines the end point of the curve. */ /*! - \qmlproperty real PathQuad::controlX - \qmlproperty real PathQuad::controlY + \qmlproperty real QtQuick1::PathQuad::controlX + \qmlproperty real QtQuick1::PathQuad::controlY Defines the position of the control point. */ @@ -722,8 +727,9 @@ void QDeclarative1PathQuad::addToPath(QPainterPath &path) /*! \qmlclass PathCubic QDeclarative1PathCubic + \inqmlmodule QtQuick 1 \ingroup qml-view-elements - \since 4.7 + \since QtQuick 1.0 \brief The PathCubic defines a cubic Bezier curve with two control points. The following QML produces the path shown below: @@ -747,15 +753,15 @@ void QDeclarative1PathQuad::addToPath(QPainterPath &path) */ /*! - \qmlproperty real PathCubic::x - \qmlproperty real PathCubic::y + \qmlproperty real QtQuick1::PathCubic::x + \qmlproperty real QtQuick1::PathCubic::y Defines the end point of the curve. */ /*! - \qmlproperty real PathCubic::control1X - \qmlproperty real PathCubic::control1Y + \qmlproperty real QtQuick1::PathCubic::control1X + \qmlproperty real QtQuick1::PathCubic::control1Y Defines the position of the first control point. */ @@ -788,8 +794,8 @@ void QDeclarative1PathCubic::setControl1Y(qreal y) } /*! - \qmlproperty real PathCubic::control2X - \qmlproperty real PathCubic::control2Y + \qmlproperty real QtQuick1::PathCubic::control2X + \qmlproperty real QtQuick1::PathCubic::control2Y Defines the position of the second control point. */ @@ -830,8 +836,9 @@ void QDeclarative1PathCubic::addToPath(QPainterPath &path) /*! \qmlclass PathPercent QDeclarative1PathPercent + \inqmlmodule QtQuick 1 \ingroup qml-view-elements - \since 4.7 + \since QtQuick 1.0 \brief The PathPercent manipulates the way a path is interpreted. PathPercent allows you to manipulate the spacing between items on a @@ -879,7 +886,7 @@ void QDeclarative1PathCubic::addToPath(QPainterPath &path) */ /*! - \qmlproperty real PathPercent::value + \qmlproperty real QtQuick1::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/qtquick1/graphicsitems/qdeclarativepathview.cpp b/src/qtquick1/graphicsitems/qdeclarativepathview.cpp index ba914a9773..2c0875b4c4 100644 --- a/src/qtquick1/graphicsitems/qdeclarativepathview.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativepathview.cpp @@ -348,8 +348,9 @@ void QDeclarative1PathViewPrivate::regenerate() /*! \qmlclass PathView QDeclarative1PathView + \inqmlmodule QtQuick 1 \ingroup qml-view-elements - \since 4.7 + \since QtQuick 1.0 \brief The PathView element lays out model-provided items on a path. \inherits Item @@ -467,7 +468,7 @@ QDeclarative1PathView::~QDeclarative1PathView() */ /*! - \qmlproperty model PathView::model + \qmlproperty model QtQuick1::PathView::model This property holds the model providing data for the view. The model provides a set of data that is used to create the items for the view. @@ -538,7 +539,7 @@ void QDeclarative1PathView::setModel(const QVariant &model) } /*! - \qmlproperty int PathView::count + \qmlproperty int QtQuick1::PathView::count This property holds the number of items in the model. */ int QDeclarative1PathView::count() const @@ -548,7 +549,7 @@ int QDeclarative1PathView::count() const } /*! - \qmlproperty Path PathView::path + \qmlproperty Path QtQuick1::PathView::path This property holds the path used to lay out the items. For more information see the \l Path documentation. */ @@ -579,7 +580,7 @@ void QDeclarative1PathView::setPath(QDeclarative1Path *path) } /*! - \qmlproperty int PathView::currentIndex + \qmlproperty int QtQuick1::PathView::currentIndex This property holds the index of the current item. */ int QDeclarative1PathView::currentIndex() const @@ -624,7 +625,7 @@ void QDeclarative1PathView::setCurrentIndex(int idx) } /*! - \qmlmethod PathView::incrementCurrentIndex() + \qmlmethod QtQuick1::PathView::incrementCurrentIndex() Increments the current index. @@ -639,7 +640,7 @@ void QDeclarative1PathView::incrementCurrentIndex() /*! - \qmlmethod PathView::decrementCurrentIndex() + \qmlmethod QtQuick1::PathView::decrementCurrentIndex() Decrements the current index. @@ -658,7 +659,7 @@ void QDeclarative1PathView::decrementCurrentIndex() } /*! - \qmlproperty real PathView::offset + \qmlproperty real QtQuick1::PathView::offset The offset specifies how far along the path the items are from their initial positions. This is a real number that ranges from 0.0 to the count of items in the model. @@ -698,7 +699,7 @@ void QDeclarative1PathViewPrivate::setAdjustedOffset(qreal o) } /*! - \qmlproperty Component PathView::highlight + \qmlproperty Component QtQuick1::PathView::highlight This property holds the component to use as the highlight. An instance of the highlight component will be created for each view. @@ -739,7 +740,7 @@ void QDeclarative1PathView::setHighlight(QDeclarativeComponent *highlight) } /*! - \qmlproperty Item PathView::highlightItem + \qmlproperty Item QtQuick1::PathView::highlightItem \c highlightItem holds the highlight item, which was created from the \l highlight component. @@ -752,9 +753,9 @@ QDeclarativeItem *QDeclarative1PathView::highlightItem() return d->highlightItem; } /*! - \qmlproperty real PathView::preferredHighlightBegin - \qmlproperty real PathView::preferredHighlightEnd - \qmlproperty enumeration PathView::highlightRangeMode + \qmlproperty real QtQuick1::PathView::preferredHighlightBegin + \qmlproperty real QtQuick1::PathView::preferredHighlightEnd + \qmlproperty enumeration QtQuick1::PathView::highlightRangeMode These properties set the preferred range of the highlight (current item) within the view. The preferred values must be in the range 0.0-1.0. @@ -838,7 +839,7 @@ void QDeclarative1PathView::setHighlightRangeMode(HighlightRangeMode mode) /*! - \qmlproperty int PathView::highlightMoveDuration + \qmlproperty int QtQuick1::PathView::highlightMoveDuration This property holds the move animation duration of the highlight delegate. If the highlightRangeMode is StrictlyEnforceRange then this property @@ -862,7 +863,7 @@ void QDeclarative1PathView::setHighlightMoveDuration(int duration) } /*! - \qmlproperty real PathView::dragMargin + \qmlproperty real QtQuick1::PathView::dragMargin This property holds the maximum distance from the path that initiate mouse dragging. By default the path can only be dragged by clicking on an item. If @@ -885,7 +886,7 @@ void QDeclarative1PathView::setDragMargin(qreal dragMargin) } /*! - \qmlproperty real PathView::flickDeceleration + \qmlproperty real QtQuick1::PathView::flickDeceleration This property holds the rate at which a flick will decelerate. The default is 100. @@ -906,7 +907,7 @@ void QDeclarative1PathView::setFlickDeceleration(qreal dec) } /*! - \qmlproperty bool PathView::interactive + \qmlproperty bool QtQuick1::PathView::interactive A user cannot drag or flick a PathView that is not interactive. @@ -931,7 +932,7 @@ void QDeclarative1PathView::setInteractive(bool interactive) } /*! - \qmlproperty bool PathView::moving + \qmlproperty bool QtQuick1::PathView::moving This property holds whether the view is currently moving due to the user either dragging or flicking the view. @@ -943,7 +944,7 @@ bool QDeclarative1PathView::isMoving() const } /*! - \qmlproperty bool PathView::flicking + \qmlproperty bool QtQuick1::PathView::flicking This property holds whether the view is currently moving due to the user flicking the view. @@ -955,14 +956,14 @@ bool QDeclarative1PathView::isFlicking() const } /*! - \qmlsignal PathView::onMovementStarted() + \qmlsignal QtQuick1::PathView::onMovementStarted() This handler is called when the view begins moving due to user interaction. */ /*! - \qmlsignal PathView::onMovementEnded() + \qmlsignal QtQuick1::PathView::onMovementEnded() This handler is called when the view stops moving due to user interaction. If a flick was generated, this handler will @@ -972,7 +973,7 @@ bool QDeclarative1PathView::isFlicking() const */ /*! - \qmlsignal PathView::onFlickStarted() + \qmlsignal QtQuick1::PathView::onFlickStarted() This handler is called when the view is flicked. A flick starts from the point that the mouse or touch is released, @@ -980,13 +981,13 @@ bool QDeclarative1PathView::isFlicking() const */ /*! - \qmlsignal PathView::onFlickEnded() + \qmlsignal QtQuick1::PathView::onFlickEnded() This handler is called when the view stops moving due to a flick. */ /*! - \qmlproperty Component PathView::delegate + \qmlproperty Component QtQuick1::PathView::delegate The delegate provides a template defining each item instantiated by the view. The index is exposed as an accessible \c index property. Properties of the @@ -1035,7 +1036,7 @@ void QDeclarative1PathView::setDelegate(QDeclarativeComponent *delegate) } /*! - \qmlproperty int PathView::pathItemCount + \qmlproperty int QtQuick1::PathView::pathItemCount This property holds the number of items visible on the path at any one time. */ int QDeclarative1PathView::pathItemCount() const diff --git a/src/qtquick1/graphicsitems/qdeclarativepincharea.cpp b/src/qtquick1/graphicsitems/qdeclarativepincharea.cpp index 8efe6e5c8a..e784a9ffa6 100644 --- a/src/qtquick1/graphicsitems/qdeclarativepincharea.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativepincharea.cpp @@ -55,6 +55,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass PinchEvent QDeclarative1PinchEvent + \inqmlmodule QtQuick 1 \ingroup qml-event-elements \brief The PinchEvent object provides information about a pinch event. @@ -75,9 +76,9 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty QPointF PinchEvent::center - \qmlproperty QPointF PinchEvent::startCenter - \qmlproperty QPointF PinchEvent::previousCenter + \qmlproperty QPointF QtQuick1::PinchEvent::center + \qmlproperty QPointF QtQuick1::PinchEvent::startCenter + \qmlproperty QPointF QtQuick1::PinchEvent::previousCenter These properties hold the position of the center point between the two touch points. @@ -89,8 +90,8 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty real PinchEvent::scale - \qmlproperty real PinchEvent::previousScale + \qmlproperty real QtQuick1::PinchEvent::scale + \qmlproperty real QtQuick1::PinchEvent::previousScale These properties hold the scale factor determined by the change in distance between the two touch points. @@ -103,9 +104,9 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty real PinchEvent::angle - \qmlproperty real PinchEvent::previousAngle - \qmlproperty real PinchEvent::rotation + \qmlproperty real QtQuick1::PinchEvent::angle + \qmlproperty real QtQuick1::PinchEvent::previousAngle + \qmlproperty real QtQuick1::PinchEvent::rotation These properties hold the angle between the two touch points. @@ -119,10 +120,10 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty QPointF PinchEvent::point1 - \qmlproperty QPointF PinchEvent::startPoint1 - \qmlproperty QPointF PinchEvent::point2 - \qmlproperty QPointF PinchEvent::startPoint2 + \qmlproperty QPointF QtQuick1::PinchEvent::point1 + \qmlproperty QPointF QtQuick1::PinchEvent::startPoint1 + \qmlproperty QPointF QtQuick1::PinchEvent::point2 + \qmlproperty QPointF QtQuick1::PinchEvent::startPoint2 These properties provide the actual touch points generating the pinch. @@ -133,7 +134,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool PinchEvent::accepted + \qmlproperty bool QtQuick1::PinchEvent::accepted Setting this property to false in the \c PinchArea::onPinchStarted handler will result in no further pinch events being generated, and the gesture @@ -141,7 +142,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty int PinchEvent::pointCount + \qmlproperty int QtQuick1::PinchEvent::pointCount Holds the number of points currently touched. The PinchArea will not react until two touch points have initited a gesture, but will remain active until @@ -163,6 +164,7 @@ QDeclarative1PinchAreaPrivate::~QDeclarative1PinchAreaPrivate() /*! \qmlclass PinchArea QDeclarative1PinchArea + \inqmlmodule QtQuick 1 \brief The PinchArea item enables simple pinch gesture handling. \inherits Item @@ -186,7 +188,7 @@ QDeclarative1PinchAreaPrivate::~QDeclarative1PinchAreaPrivate() */ /*! - \qmlsignal PinchArea::onPinchStarted() + \qmlsignal QtQuick1::PinchArea::onPinchStarted() This handler is called when the pinch area detects that a pinch gesture has started. @@ -198,7 +200,7 @@ QDeclarative1PinchAreaPrivate::~QDeclarative1PinchAreaPrivate() */ /*! - \qmlsignal PinchArea::onPinchUpdated() + \qmlsignal QtQuick1::PinchArea::onPinchUpdated() This handler is called when the pinch area detects that a pinch gesture has changed. @@ -207,7 +209,7 @@ QDeclarative1PinchAreaPrivate::~QDeclarative1PinchAreaPrivate() */ /*! - \qmlsignal PinchArea::onPinchFinished() + \qmlsignal QtQuick1::PinchArea::onPinchFinished() This handler is called when the pinch area detects that a pinch gesture has finished. @@ -217,17 +219,17 @@ QDeclarative1PinchAreaPrivate::~QDeclarative1PinchAreaPrivate() /*! - \qmlproperty Item PinchArea::pinch.target - \qmlproperty bool PinchArea::pinch.active - \qmlproperty real PinchArea::pinch.minimumScale - \qmlproperty real PinchArea::pinch.maximumScale - \qmlproperty real PinchArea::pinch.minimumRotation - \qmlproperty real PinchArea::pinch.maximumRotation - \qmlproperty enumeration PinchArea::pinch.dragAxis - \qmlproperty real PinchArea::pinch.minimumX - \qmlproperty real PinchArea::pinch.maximumX - \qmlproperty real PinchArea::pinch.minimumY - \qmlproperty real PinchArea::pinch.maximumY + \qmlproperty Item QtQuick1::PinchArea::pinch.target + \qmlproperty bool QtQuick1::PinchArea::pinch.active + \qmlproperty real QtQuick1::PinchArea::pinch.minimumScale + \qmlproperty real QtQuick1::PinchArea::pinch.maximumScale + \qmlproperty real QtQuick1::PinchArea::pinch.minimumRotation + \qmlproperty real QtQuick1::PinchArea::pinch.maximumRotation + \qmlproperty enumeration QtQuick1::PinchArea::pinch.dragAxis + \qmlproperty real QtQuick1::PinchArea::pinch.minimumX + \qmlproperty real QtQuick1::PinchArea::pinch.maximumX + \qmlproperty real QtQuick1::PinchArea::pinch.minimumY + \qmlproperty real QtQuick1::PinchArea::pinch.maximumY \c pinch provides a convenient way to make an item react to pinch gestures. @@ -253,7 +255,7 @@ QDeclarative1PinchArea::~QDeclarative1PinchArea() } /*! - \qmlproperty bool PinchArea::enabled + \qmlproperty bool QtQuick1::PinchArea::enabled This property holds whether the item accepts pinch gestures. This property defaults to true. diff --git a/src/qtquick1/graphicsitems/qdeclarativepositioners.cpp b/src/qtquick1/graphicsitems/qdeclarativepositioners.cpp index 0defe40641..7046945d27 100644 --- a/src/qtquick1/graphicsitems/qdeclarativepositioners.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativepositioners.cpp @@ -325,8 +325,9 @@ void QDeclarative1BasePositioner::finishApplyTransitions() /*! \qmlclass Column QDeclarative1Column + \inqmlmodule QtQuick 1 \ingroup qml-positioning-elements - \since 4.7 + \since QtQuick 1.0 \brief The Column item arranges its children vertically. \inherits Item @@ -390,7 +391,7 @@ void QDeclarative1BasePositioner::finishApplyTransitions() \sa Row, Grid, Flow, {declarative/positioners}{Positioners example} */ /*! - \qmlproperty Transition Column::add + \qmlproperty Transition QtQuick1::Column::add This property holds the transition to be applied when adding an item to the positioner. The transition will only be applied to the @@ -405,7 +406,7 @@ void QDeclarative1BasePositioner::finishApplyTransitions() \sa move */ /*! - \qmlproperty Transition Column::move + \qmlproperty Transition QtQuick1::Column::move This property holds the transition to apply when moving an item within the positioner. Positioner transitions will only affect @@ -430,7 +431,7 @@ void QDeclarative1BasePositioner::finishApplyTransitions() \sa add, {declarative/positioners}{Positioners example} */ /*! - \qmlproperty int Column::spacing + \qmlproperty int QtQuick1::Column::spacing The spacing is the amount in pixels left empty between adjacent items. The default spacing is 0. @@ -489,8 +490,9 @@ void QDeclarative1Column::reportConflictingAnchors() /*! \qmlclass Row QDeclarative1Row + \inqmlmodule QtQuick 1 \ingroup qml-positioning-elements - \since 4.7 + \since QtQuick 1.0 \brief The Row item arranges its children horizontally. \inherits Item @@ -533,7 +535,7 @@ void QDeclarative1Column::reportConflictingAnchors() \sa Column, Grid, Flow, {declarative/positioners}{Positioners example} */ /*! - \qmlproperty Transition Row::add + \qmlproperty Transition QtQuick1::Row::add This property holds the transition to be applied when adding an item to the positioner. The transition will only be applied to the @@ -548,7 +550,7 @@ void QDeclarative1Column::reportConflictingAnchors() \sa move */ /*! - \qmlproperty Transition Row::move + \qmlproperty Transition QtQuick1::Row::move This property holds the transition to be applied when moving an item within the positioner. Positioner transitions will only affect @@ -572,7 +574,7 @@ void QDeclarative1Column::reportConflictingAnchors() \sa add, {declarative/positioners}{Positioners example} */ /*! - \qmlproperty int Row::spacing + \qmlproperty int QtQuick1::Row::spacing The spacing is the amount in pixels left empty between adjacent items. The default spacing is 0. @@ -585,7 +587,7 @@ QDeclarative1Row::QDeclarative1Row(QDeclarativeItem *parent) } /*! - \qmlproperty enumeration Row::layoutDirection + \qmlproperty enumeration QtQuick1::Row::layoutDirection \since Quick 1.1 This property holds the layoutDirection of the row. @@ -623,7 +625,7 @@ void QDeclarative1Row::setLayoutDirection(Qt::LayoutDirection layoutDirection) } /*! - \qmlproperty enumeration Row::effectiveLayoutDirection + \qmlproperty enumeration QtQuick1::Row::effectiveLayoutDirection This property holds the effective layout direction of the row positioner. When using the attached property \l {LayoutMirroring::enabled}{LayoutMirroring::enabled} for locale layouts, @@ -710,8 +712,9 @@ void QDeclarative1Row::reportConflictingAnchors() /*! \qmlclass Grid QDeclarative1Grid + \inqmlmodule QtQuick 1 \ingroup qml-positioning-elements - \since 4.7 + \since QtQuick 1.0 \brief The Grid item positions its children in a grid. \inherits Item @@ -763,7 +766,7 @@ void QDeclarative1Row::reportConflictingAnchors() \sa Flow, Row, Column, {declarative/positioners}{Positioners example} */ /*! - \qmlproperty Transition Grid::add + \qmlproperty Transition QtQuick1::Grid::add This property holds the transition to be applied when adding an item to the positioner. The transition will only be applied to the @@ -778,7 +781,7 @@ void QDeclarative1Row::reportConflictingAnchors() \sa move */ /*! - \qmlproperty Transition Grid::move + \qmlproperty Transition QtQuick1::Grid::move This property holds the transition to be applied when moving an item within the positioner. Positioner transitions will only affect @@ -801,7 +804,7 @@ void QDeclarative1Row::reportConflictingAnchors() \sa add, {declarative/positioners}{Positioners example} */ /*! - \qmlproperty int Grid::spacing + \qmlproperty int QtQuick1::Grid::spacing The spacing is the amount in pixels left empty between adjacent items. The default spacing is 0. @@ -823,7 +826,7 @@ QDeclarative1Grid::QDeclarative1Grid(QDeclarativeItem *parent) : } /*! - \qmlproperty int Grid::columns + \qmlproperty int QtQuick1::Grid::columns This property holds the number of columns in the grid. The default number of columns is 4. @@ -833,7 +836,7 @@ QDeclarative1Grid::QDeclarative1Grid(QDeclarativeItem *parent) : */ /*! - \qmlproperty int Grid::rows + \qmlproperty int QtQuick1::Grid::rows This property holds the number of rows in the grid. If the grid does not have enough items to fill the specified @@ -859,7 +862,7 @@ void QDeclarative1Grid::setRows(const int rows) } /*! - \qmlproperty enumeration Grid::flow + \qmlproperty enumeration QtQuick1::Grid::flow This property holds the flow of the layout. Possible values are: @@ -886,7 +889,7 @@ void QDeclarative1Grid::setFlow(Flow flow) } /*! - \qmlproperty enumeration Grid::layoutDirection + \qmlproperty enumeration QtQuick1::Grid::layoutDirection \since Quick 1.1 This property holds the layout direction of the layout. @@ -926,7 +929,7 @@ void QDeclarative1Grid::setLayoutDirection(Qt::LayoutDirection layoutDirection) } /*! - \qmlproperty enumeration Grid::effectiveLayoutDirection + \qmlproperty enumeration QtQuick1::Grid::effectiveLayoutDirection This property holds the effective layout direction of the grid positioner. When using the attached property \l {LayoutMirroring::enabled}{LayoutMirroring::enabled} for locale layouts, @@ -1102,8 +1105,9 @@ void QDeclarative1Grid::reportConflictingAnchors() /*! \qmlclass Flow QDeclarative1Flow + \inqmlmodule QtQuick 1 \ingroup qml-positioning-elements - \since 4.7 + \since QtQuick 1.0 \brief The Flow item arranges its children side by side, wrapping as necessary. \inherits Item @@ -1152,7 +1156,7 @@ void QDeclarative1Grid::reportConflictingAnchors() \sa Column, Row, Grid, {declarative/positioners}{Positioners example} */ /*! - \qmlproperty Transition Flow::add + \qmlproperty Transition QtQuick1::Flow::add This property holds the transition to be applied when adding an item to the positioner. The transition will only be applied to the @@ -1167,7 +1171,7 @@ void QDeclarative1Grid::reportConflictingAnchors() \sa move */ /*! - \qmlproperty Transition Flow::move + \qmlproperty Transition QtQuick1::Flow::move This property holds the transition to be applied when moving an item within the positioner. Positioner transitions will only affect @@ -1191,7 +1195,7 @@ void QDeclarative1Grid::reportConflictingAnchors() \sa add, {declarative/positioners}{Positioners example} */ /*! - \qmlproperty int Flow::spacing + \qmlproperty int QtQuick1::Flow::spacing spacing is the amount in pixels left empty between each adjacent item, and defaults to 0. @@ -1220,7 +1224,7 @@ QDeclarative1Flow::QDeclarative1Flow(QDeclarativeItem *parent) } /*! - \qmlproperty enumeration Flow::flow + \qmlproperty enumeration QtQuick1::Flow::flow This property holds the flow of the layout. Possible values are: @@ -1251,7 +1255,7 @@ void QDeclarative1Flow::setFlow(Flow flow) } /*! - \qmlproperty enumeration Flow::layoutDirection + \qmlproperty enumeration QtQuick1::Flow::layoutDirection \since Quick 1.1 This property holds the layout direction of the layout. @@ -1288,7 +1292,7 @@ void QDeclarative1Flow::setLayoutDirection(Qt::LayoutDirection layoutDirection) } /*! - \qmlproperty enumeration Flow::effectiveLayoutDirection + \qmlproperty enumeration QtQuick1::Flow::effectiveLayoutDirection This property holds the effective layout direction of the flow positioner. When using the attached property \l {LayoutMirroring::enabled}{LayoutMirroring::enabled} for locale layouts, diff --git a/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp b/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp index d0bb5d143d..fe324ca9a1 100644 --- a/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp @@ -89,16 +89,17 @@ void QDeclarative1Pen::setWidth(int w) /*! \qmlclass GradientStop QDeclarative1GradientStop + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements - \since 4.7 + \since QtQuick 1.0 \brief The GradientStop item defines the color at a position in a Gradient. \sa Gradient */ /*! - \qmlproperty real GradientStop::position - \qmlproperty color GradientStop::color + \qmlproperty real QtQuick1::GradientStop::position + \qmlproperty color QtQuick1::GradientStop::color The position and color properties describe the color used at a given position in a gradient, as represented by a gradient stop. @@ -116,8 +117,9 @@ void QDeclarative1GradientStop::updateGradient() /*! \qmlclass Gradient QDeclarative1Gradient + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements - \since 4.7 + \since QtQuick 1.0 \brief The Gradient item defines a gradient fill. A gradient is defined by two or more colors, which will be blended seamlessly. @@ -166,7 +168,7 @@ void QDeclarative1GradientStop::updateGradient() */ /*! - \qmlproperty list<GradientStop> Gradient::stops + \qmlproperty list<GradientStop> QtQuick1::Gradient::stops This property holds the gradient stops describing the gradient. By default, this property contains an empty list. @@ -198,8 +200,9 @@ void QDeclarative1Gradient::doUpdate() /*! \qmlclass Rectangle QDeclarative1Rectangle + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements - \since 4.7 + \since QtQuick 1.0 \brief The Rectangle item provides a filled rectangle with an optional border. \inherits Item @@ -258,8 +261,8 @@ void QDeclarative1Rectangle::doUpdate() } /*! - \qmlproperty int Rectangle::border.width - \qmlproperty color Rectangle::border.color + \qmlproperty int QtQuick1::Rectangle::border.width + \qmlproperty color QtQuick1::Rectangle::border.color The width and color used to draw the border of the rectangle. @@ -291,7 +294,7 @@ QDeclarative1Pen *QDeclarative1Rectangle::border() } /*! - \qmlproperty Gradient Rectangle::gradient + \qmlproperty Gradient QtQuick1::Rectangle::gradient The gradient to use to fill the rectangle. @@ -335,7 +338,7 @@ void QDeclarative1Rectangle::setGradient(QDeclarative1Gradient *gradient) /*! - \qmlproperty real Rectangle::radius + \qmlproperty real QtQuick1::Rectangle::radius This property holds the corner radius used to draw a rounded rectangle. If radius is non-zero, the rectangle will be painted as a rounded rectangle, otherwise it will be @@ -361,7 +364,7 @@ void QDeclarative1Rectangle::setRadius(qreal radius) } /*! - \qmlproperty color Rectangle::color + \qmlproperty color QtQuick1::Rectangle::color This property holds the color used to fill the rectangle. The default color is white. @@ -565,7 +568,7 @@ void QDeclarative1Rectangle::drawRect(QPainter &p) } /*! - \qmlproperty bool Rectangle::smooth + \qmlproperty bool QtQuick1::Rectangle::smooth Set this property if you want the item to be smoothly scaled or transformed. Smooth filtering gives better visual quality, but is slower. If diff --git a/src/qtquick1/graphicsitems/qdeclarativerepeater.cpp b/src/qtquick1/graphicsitems/qdeclarativerepeater.cpp index cebff875e8..cc080d10d3 100644 --- a/src/qtquick1/graphicsitems/qdeclarativerepeater.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativerepeater.cpp @@ -62,8 +62,9 @@ QDeclarative1RepeaterPrivate::~QDeclarative1RepeaterPrivate() /*! \qmlclass Repeater QDeclarative1Repeater + \inqmlmodule QtQuick 1 \ingroup qml-utility-elements - \since 4.7 + \since QtQuick 1.0 \inherits Item \brief The Repeater element allows you to repeat an Item-based component using a model. @@ -127,7 +128,7 @@ QDeclarative1RepeaterPrivate::~QDeclarative1RepeaterPrivate() */ /*! - \qmlsignal Repeater::onItemAdded(int index, Item item) + \qmlsignal QtQuick1::Repeater::onItemAdded(int index, Item item) \since Quick 1.1 This handler is called when an item is added to the repeater. The \a index @@ -136,7 +137,7 @@ QDeclarative1RepeaterPrivate::~QDeclarative1RepeaterPrivate() */ /*! - \qmlsignal Repeater::onItemRemoved(int index, Item item) + \qmlsignal QtQuick1::Repeater::onItemRemoved(int index, Item item) \since Quick 1.1 This handler is called when an item is removed from the repeater. The \a index @@ -157,7 +158,7 @@ QDeclarative1Repeater::~QDeclarative1Repeater() } /*! - \qmlproperty any Repeater::model + \qmlproperty any QtQuick1::Repeater::model The model providing data for the repeater. @@ -230,7 +231,7 @@ void QDeclarative1Repeater::setModel(const QVariant &model) } /*! - \qmlproperty Component Repeater::delegate + \qmlproperty Component QtQuick1::Repeater::delegate \default The delegate provides a template defining each item instantiated by the repeater. @@ -292,7 +293,7 @@ void QDeclarative1Repeater::setDelegate(QDeclarativeComponent *delegate) } /*! - \qmlproperty int Repeater::count + \qmlproperty int QtQuick1::Repeater::count This property holds the number of items in the repeater. */ @@ -305,7 +306,7 @@ int QDeclarative1Repeater::count() const } /*! - \qmlmethod Item Repeater::itemAt(index) + \qmlmethod Item QtQuick1::Repeater::itemAt(index) \since Quick 1.1 Returns the \l Item that has been created at the given \a index, or \c null diff --git a/src/qtquick1/graphicsitems/qdeclarativetext.cpp b/src/qtquick1/graphicsitems/qdeclarativetext.cpp index 8a497c271e..6974f73739 100644 --- a/src/qtquick1/graphicsitems/qdeclarativetext.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativetext.cpp @@ -668,8 +668,9 @@ QPixmap QDeclarative1TextPrivate::drawOutline(const QPixmap &source, const QPixm /*! \qmlclass Text QDeclarative1Text + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements - \since 4.7 + \since QtQuick 1.0 \brief The Text item allows you to add formatted text to a scene. \inherits Item @@ -719,7 +720,7 @@ QDeclarative1Text::~QDeclarative1Text() } /*! - \qmlproperty bool Text::clip + \qmlproperty bool QtQuick1::Text::clip This property holds whether the text is clipped. Note that if the text does not fit in the bounding rectangle it will be abruptly chopped. @@ -728,7 +729,7 @@ QDeclarative1Text::~QDeclarative1Text() */ /*! - \qmlproperty bool Text::smooth + \qmlproperty bool QtQuick1::Text::smooth This property holds whether the text is smoothly scaled or transformed. @@ -742,7 +743,7 @@ QDeclarative1Text::~QDeclarative1Text() */ /*! - \qmlsignal Text::onLinkActivated(string link) + \qmlsignal QtQuick1::Text::onLinkActivated(string link) This handler is called when the user clicks on a link embedded in the text. The link must be in rich text or HTML format and the @@ -758,7 +759,7 @@ QDeclarative1Text::~QDeclarative1Text() */ /*! - \qmlproperty string Text::font.family + \qmlproperty string QtQuick1::Text::font.family Sets the family name of the font. @@ -768,13 +769,13 @@ QDeclarative1Text::~QDeclarative1Text() */ /*! - \qmlproperty bool Text::font.bold + \qmlproperty bool QtQuick1::Text::font.bold Sets whether the font weight is bold. */ /*! - \qmlproperty enumeration Text::font.weight + \qmlproperty enumeration QtQuick1::Text::font.weight Sets the font's weight. @@ -793,31 +794,31 @@ QDeclarative1Text::~QDeclarative1Text() */ /*! - \qmlproperty bool Text::font.italic + \qmlproperty bool QtQuick1::Text::font.italic Sets whether the font has an italic style. */ /*! - \qmlproperty bool Text::font.underline + \qmlproperty bool QtQuick1::Text::font.underline Sets whether the text is underlined. */ /*! - \qmlproperty bool Text::font.strikeout + \qmlproperty bool QtQuick1::Text::font.strikeout Sets whether the font has a strikeout style. */ /*! - \qmlproperty real Text::font.pointSize + \qmlproperty real QtQuick1::Text::font.pointSize Sets the font size in points. The point size must be greater than zero. */ /*! - \qmlproperty int Text::font.pixelSize + \qmlproperty int QtQuick1::Text::font.pixelSize Sets the font size in pixels. @@ -826,7 +827,7 @@ QDeclarative1Text::~QDeclarative1Text() */ /*! - \qmlproperty real Text::font.letterSpacing + \qmlproperty real QtQuick1::Text::font.letterSpacing Sets the letter spacing for the font. @@ -835,7 +836,7 @@ QDeclarative1Text::~QDeclarative1Text() */ /*! - \qmlproperty real Text::font.wordSpacing + \qmlproperty real QtQuick1::Text::font.wordSpacing Sets the word spacing for the font. @@ -845,7 +846,7 @@ QDeclarative1Text::~QDeclarative1Text() */ /*! - \qmlproperty enumeration Text::font.capitalization + \qmlproperty enumeration QtQuick1::Text::font.capitalization Sets the capitalization for the text. @@ -889,7 +890,7 @@ void QDeclarative1Text::setFont(const QFont &font) } /*! - \qmlproperty string Text::text + \qmlproperty string QtQuick1::Text::text The text to display. Text supports both plain and rich text strings. @@ -926,7 +927,7 @@ void QDeclarative1Text::setText(const QString &n) /*! - \qmlproperty color Text::color + \qmlproperty color QtQuick1::Text::color The text color. @@ -964,7 +965,7 @@ void QDeclarative1Text::setColor(const QColor &color) } /*! - \qmlproperty enumeration Text::style + \qmlproperty enumeration QtQuick1::Text::style Set an additional text style. @@ -1008,7 +1009,7 @@ void QDeclarative1Text::setStyle(QDeclarative1Text::TextStyle style) } /*! - \qmlproperty color Text::styleColor + \qmlproperty color QtQuick1::Text::styleColor Defines the secondary color used by text styles. @@ -1041,9 +1042,9 @@ void QDeclarative1Text::setStyleColor(const QColor &color) /*! - \qmlproperty enumeration Text::horizontalAlignment - \qmlproperty enumeration Text::verticalAlignment - \qmlproperty enumeration Text::effectiveHorizontalAlignment + \qmlproperty enumeration QtQuick1::Text::horizontalAlignment + \qmlproperty enumeration QtQuick1::Text::verticalAlignment + \qmlproperty enumeration QtQuick1::Text::effectiveHorizontalAlignment Sets the horizontal and vertical alignment of the text within the Text items width and height. By default, the text is vertically aligned to the top. Horizontal @@ -1166,7 +1167,7 @@ void QDeclarative1Text::setVAlign(VAlignment align) } /*! - \qmlproperty enumeration Text::wrapMode + \qmlproperty enumeration QtQuick1::Text::wrapMode Set this property to wrap the text to the Text item's width. The text will only wrap if an explicit width has been set. wrapMode can be one of: @@ -1197,7 +1198,7 @@ void QDeclarative1Text::setWrapMode(WrapMode mode) } /*! - \qmlproperty int Text::lineCount + \qmlproperty int QtQuick1::Text::lineCount \since Quick 1.1 Returns the number of lines visible in the text item. @@ -1213,7 +1214,7 @@ int QDeclarative1Text::lineCount() const } /*! - \qmlproperty bool Text::truncated + \qmlproperty bool QtQuick1::Text::truncated \since Quick 1.1 Returns true if the text has been truncated due to \l maximumLineCount @@ -1230,7 +1231,7 @@ bool QDeclarative1Text::truncated() const } /*! - \qmlproperty int Text::maximumLineCount + \qmlproperty int QtQuick1::Text::maximumLineCount \since Quick 1.1 Set this property to limit the number of lines that the text item will show. @@ -1271,7 +1272,7 @@ void QDeclarative1Text::resetMaximumLineCount() } /*! - \qmlproperty enumeration Text::textFormat + \qmlproperty enumeration QtQuick1::Text::textFormat The way the text property should be displayed. @@ -1351,7 +1352,7 @@ void QDeclarative1Text::setTextFormat(TextFormat format) } /*! - \qmlproperty enumeration Text::elide + \qmlproperty enumeration QtQuick1::Text::elide Set this property to elide parts of the text fit to the Text item's width. The text will only elide if an explicit width has been set. @@ -1440,7 +1441,7 @@ void QDeclarative1Text::geometryChanged(const QRectF &newGeometry, const QRectF } /*! - \qmlproperty real Text::paintedWidth + \qmlproperty real QtQuick1::Text::paintedWidth Returns the width of the text, including width past the width which is covered due to insufficient wrapping if WrapMode is set. @@ -1452,7 +1453,7 @@ qreal QDeclarative1Text::paintedWidth() const } /*! - \qmlproperty real Text::paintedHeight + \qmlproperty real QtQuick1::Text::paintedHeight Returns the height of the text, including height past the height which is covered due to there being more text than fits in the set height. @@ -1464,7 +1465,7 @@ qreal QDeclarative1Text::paintedHeight() const } /*! - \qmlproperty real Text::lineHeight + \qmlproperty real QtQuick1::Text::lineHeight \since Quick 1.1 Sets the line height for the text. @@ -1492,7 +1493,7 @@ void QDeclarative1Text::setLineHeight(qreal lineHeight) } /*! - \qmlproperty enumeration Text::lineHeightMode + \qmlproperty enumeration QtQuick1::Text::lineHeightMode This property determines how the line height is specified. The possible values are: diff --git a/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp b/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp index 1645bfd390..36105158f3 100644 --- a/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp @@ -65,8 +65,9 @@ QT_BEGIN_NAMESPACE /*! \qmlclass TextEdit QDeclarative1TextEdit + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements - \since 4.7 + \since QtQuick 1.0 \brief The TextEdit item displays multiple lines of editable formatted text. \inherits Item @@ -108,7 +109,7 @@ TextEdit { */ /*! - \qmlsignal TextEdit::onLinkActivated(string link) + \qmlsignal QtQuick1::TextEdit::onLinkActivated(string link) \since Quick 1.1 This handler is called when the user clicks on a link embedded in the text. @@ -135,7 +136,7 @@ QString QDeclarative1TextEdit::text() const } /*! - \qmlproperty string TextEdit::font.family + \qmlproperty string QtQuick1::TextEdit::font.family Sets the family name of the font. @@ -145,13 +146,13 @@ QString QDeclarative1TextEdit::text() const */ /*! - \qmlproperty bool TextEdit::font.bold + \qmlproperty bool QtQuick1::TextEdit::font.bold Sets whether the font weight is bold. */ /*! - \qmlproperty enumeration TextEdit::font.weight + \qmlproperty enumeration QtQuick1::TextEdit::font.weight Sets the font's weight. @@ -170,31 +171,31 @@ QString QDeclarative1TextEdit::text() const */ /*! - \qmlproperty bool TextEdit::font.italic + \qmlproperty bool QtQuick1::TextEdit::font.italic Sets whether the font has an italic style. */ /*! - \qmlproperty bool TextEdit::font.underline + \qmlproperty bool QtQuick1::TextEdit::font.underline Sets whether the text is underlined. */ /*! - \qmlproperty bool TextEdit::font.strikeout + \qmlproperty bool QtQuick1::TextEdit::font.strikeout Sets whether the font has a strikeout style. */ /*! - \qmlproperty real TextEdit::font.pointSize + \qmlproperty real QtQuick1::TextEdit::font.pointSize Sets the font size in points. The point size must be greater than zero. */ /*! - \qmlproperty int TextEdit::font.pixelSize + \qmlproperty int QtQuick1::TextEdit::font.pixelSize Sets the font size in pixels. @@ -204,7 +205,7 @@ QString QDeclarative1TextEdit::text() const */ /*! - \qmlproperty real TextEdit::font.letterSpacing + \qmlproperty real QtQuick1::TextEdit::font.letterSpacing Sets the letter spacing for the font. @@ -213,7 +214,7 @@ QString QDeclarative1TextEdit::text() const */ /*! - \qmlproperty real TextEdit::font.wordSpacing + \qmlproperty real QtQuick1::TextEdit::font.wordSpacing Sets the word spacing for the font. @@ -223,7 +224,7 @@ QString QDeclarative1TextEdit::text() const */ /*! - \qmlproperty enumeration TextEdit::font.capitalization + \qmlproperty enumeration QtQuick1::TextEdit::font.capitalization Sets the capitalization for the text. @@ -241,7 +242,7 @@ QString QDeclarative1TextEdit::text() const */ /*! - \qmlproperty string TextEdit::text + \qmlproperty string QtQuick1::TextEdit::text The text to display. If the text format is AutoText the text edit will automatically determine whether the text should be treated as @@ -267,7 +268,7 @@ void QDeclarative1TextEdit::setText(const QString &text) } /*! - \qmlproperty enumeration TextEdit::textFormat + \qmlproperty enumeration QtQuick1::TextEdit::textFormat The way the text property should be displayed. @@ -370,7 +371,7 @@ void QDeclarative1TextEdit::setFont(const QFont &font) } /*! - \qmlproperty color TextEdit::color + \qmlproperty color QtQuick1::TextEdit::color The text color. @@ -406,7 +407,7 @@ void QDeclarative1TextEdit::setColor(const QColor &color) } /*! - \qmlproperty color TextEdit::selectionColor + \qmlproperty color QtQuick1::TextEdit::selectionColor The text highlight color, used behind selections. */ @@ -432,7 +433,7 @@ void QDeclarative1TextEdit::setSelectionColor(const QColor &color) } /*! - \qmlproperty color TextEdit::selectedTextColor + \qmlproperty color QtQuick1::TextEdit::selectedTextColor The selected text color, used in selections. */ @@ -458,9 +459,9 @@ void QDeclarative1TextEdit::setSelectedTextColor(const QColor &color) } /*! - \qmlproperty enumeration TextEdit::horizontalAlignment - \qmlproperty enumeration TextEdit::verticalAlignment - \qmlproperty enumeration TextEdit::effectiveHorizontalAlignment + \qmlproperty enumeration QtQuick1::TextEdit::horizontalAlignment + \qmlproperty enumeration QtQuick1::TextEdit::verticalAlignment + \qmlproperty enumeration QtQuick1::TextEdit::effectiveHorizontalAlignment Sets the horizontal and vertical alignment of the text within the TextEdit item's width and height. By default, the text alignment follows the natural alignment @@ -588,7 +589,7 @@ void QDeclarative1TextEdit::setVAlign(QDeclarative1TextEdit::VAlignment alignmen } /*! - \qmlproperty enumeration TextEdit::wrapMode + \qmlproperty enumeration QtQuick1::TextEdit::wrapMode Set this property to wrap the text to the TextEdit item's width. The text will only wrap if an explicit width has been set. @@ -620,7 +621,7 @@ void QDeclarative1TextEdit::setWrapMode(WrapMode mode) } /*! - \qmlproperty int TextEdit::lineCount + \qmlproperty int QtQuick1::TextEdit::lineCount \since Quick 1.1 Returns the total number of lines in the textEdit item. @@ -632,7 +633,7 @@ int QDeclarative1TextEdit::lineCount() const } /*! - \qmlproperty real TextEdit::paintedWidth + \qmlproperty real QtQuick1::TextEdit::paintedWidth Returns the width of the text, including the width past the width which is covered due to insufficient wrapping if \l wrapMode is set. @@ -644,7 +645,7 @@ qreal QDeclarative1TextEdit::paintedWidth() const } /*! - \qmlproperty real TextEdit::paintedHeight + \qmlproperty real QtQuick1::TextEdit::paintedHeight Returns the height of the text, including the height past the height that is covered if the text does not fit within the set height. @@ -656,7 +657,7 @@ qreal QDeclarative1TextEdit::paintedHeight() const } /*! - \qmlmethod rectangle TextEdit::positionToRectangle(position) + \qmlmethod rectangle QtQuick1::TextEdit::positionToRectangle(position) Returns the rectangle at the given \a position in the text. The x, y, and height properties correspond to the cursor that would describe @@ -672,7 +673,7 @@ QRectF QDeclarative1TextEdit::positionToRectangle(int pos) const } /*! - \qmlmethod int TextEdit::positionAt(int x, int y) + \qmlmethod int QtQuick1::TextEdit::positionAt(int x, int y) Returns the text position closest to pixel position (\a x, \a y). @@ -714,7 +715,7 @@ void QDeclarative1TextEdit::moveCursorSelection(int pos) } /*! - \qmlmethod void TextEdit::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters) + \qmlmethod void QtQuick1::TextEdit::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters) \since Quick 1.1 Moves the cursor to \a position and updates the selection according to the optional \a mode @@ -801,7 +802,7 @@ void QDeclarative1TextEdit::moveCursorSelection(int pos, SelectionMode mode) } /*! - \qmlproperty bool TextEdit::cursorVisible + \qmlproperty bool QtQuick1::TextEdit::cursorVisible If true the text edit shows a cursor. This property is set and unset when the text edit gets active focus, but it can also @@ -827,7 +828,7 @@ void QDeclarative1TextEdit::setCursorVisible(bool on) } /*! - \qmlproperty int TextEdit::cursorPosition + \qmlproperty int QtQuick1::TextEdit::cursorPosition The position of the cursor in the TextEdit. */ int QDeclarative1TextEdit::cursorPosition() const @@ -849,7 +850,7 @@ void QDeclarative1TextEdit::setCursorPosition(int pos) } /*! - \qmlproperty Component TextEdit::cursorDelegate + \qmlproperty Component QtQuick1::TextEdit::cursorDelegate The delegate for the cursor in the TextEdit. If you set a cursorDelegate for a TextEdit, this delegate will be used for @@ -909,7 +910,7 @@ void QDeclarative1TextEdit::loadCursorDelegate() } /*! - \qmlproperty int TextEdit::selectionStart + \qmlproperty int QtQuick1::TextEdit::selectionStart The cursor position before the first character in the current selection. @@ -925,7 +926,7 @@ int QDeclarative1TextEdit::selectionStart() const } /*! - \qmlproperty int TextEdit::selectionEnd + \qmlproperty int QtQuick1::TextEdit::selectionEnd The cursor position after the last character in the current selection. @@ -941,7 +942,7 @@ int QDeclarative1TextEdit::selectionEnd() const } /*! - \qmlproperty string TextEdit::selectedText + \qmlproperty string QtQuick1::TextEdit::selectedText This read-only property provides the text currently selected in the text edit. @@ -961,7 +962,7 @@ QString QDeclarative1TextEdit::selectedText() const } /*! - \qmlproperty bool TextEdit::activeFocusOnPress + \qmlproperty bool QtQuick1::TextEdit::activeFocusOnPress Whether the TextEdit should gain active focus on a mouse press. By default this is set to true. @@ -982,7 +983,7 @@ void QDeclarative1TextEdit::setFocusOnPress(bool on) } /*! - \qmlproperty bool TextEdit::persistentSelection + \qmlproperty bool QtQuick1::TextEdit::persistentSelection Whether the TextEdit should keep the selection visible when it loses active focus to another item in the scene. By default this is set to true; @@ -1003,7 +1004,7 @@ void QDeclarative1TextEdit::setPersistentSelection(bool on) } /* - \qmlproperty real TextEdit::textMargin + \qmlproperty real QtQuick1::TextEdit::textMargin The margin, in pixels, around the text in the TextEdit. */ @@ -1048,7 +1049,7 @@ void QDeclarative1TextEdit::componentComplete() } /*! - \qmlproperty bool TextEdit::selectByMouse + \qmlproperty bool QtQuick1::TextEdit::selectByMouse Defaults to false. @@ -1079,7 +1080,7 @@ void QDeclarative1TextEdit::setSelectByMouse(bool on) /*! - \qmlproperty enum TextEdit::mouseSelectionMode + \qmlproperty enum QtQuick1::TextEdit::mouseSelectionMode \since Quick 1.1 Specifies how text should be selected using a mouse. @@ -1109,7 +1110,7 @@ void QDeclarative1TextEdit::setMouseSelectionMode(SelectionMode mode) } /*! - \qmlproperty bool TextEdit::readOnly + \qmlproperty bool QtQuick1::TextEdit::readOnly Whether the user can interact with the TextEdit item. If this property is set to true the text cannot be edited by user interaction. @@ -1163,7 +1164,7 @@ Qt::TextInteractionFlags QDeclarative1TextEdit::textInteractionFlags() const } /*! - \qmlproperty rectangle TextEdit::cursorRectangle + \qmlproperty rectangle QtQuick1::TextEdit::cursorRectangle The rectangle where the text cursor is rendered within the text edit. Read-only. @@ -1225,7 +1226,7 @@ void QDeclarative1TextEditPrivate::focusChanged(bool hasFocus) } /*! - \qmlmethod void TextEdit::deselect() + \qmlmethod void QtQuick1::TextEdit::deselect() \since Quick 1.1 Removes active text selection. @@ -1239,7 +1240,7 @@ void QDeclarative1TextEdit::deselect() } /*! - \qmlmethod void TextEdit::selectAll() + \qmlmethod void QtQuick1::TextEdit::selectAll() Causes all text to be selected. */ @@ -1250,7 +1251,7 @@ void QDeclarative1TextEdit::selectAll() } /*! - \qmlmethod void TextEdit::selectWord() + \qmlmethod void QtQuick1::TextEdit::selectWord() Causes the word closest to the current cursor position to be selected. */ @@ -1263,7 +1264,7 @@ void QDeclarative1TextEdit::selectWord() } /*! - \qmlmethod void TextEdit::select(int start, int end) + \qmlmethod void QtQuick1::TextEdit::select(int start, int end) Causes the text from \a start to \a end to be selected. @@ -1292,7 +1293,7 @@ void QDeclarative1TextEdit::select(int start, int end) } /*! - \qmlmethod void TextEdit::isRightToLeft(int start, int end) + \qmlmethod void QtQuick1::TextEdit::isRightToLeft(int start, int end) Returns true if the natural reading direction of the editor text found between positions \a start and \a end is right to left. @@ -1310,7 +1311,7 @@ bool QDeclarative1TextEdit::isRightToLeft(int start, int end) #ifndef QT_NO_CLIPBOARD /*! - \qmlmethod TextEdit::cut() + \qmlmethod QtQuick1::TextEdit::cut() Moves the currently selected text to the system clipboard. */ @@ -1321,7 +1322,7 @@ void QDeclarative1TextEdit::cut() } /*! - \qmlmethod TextEdit::copy() + \qmlmethod QtQuick1::TextEdit::copy() Copies the currently selected text to the system clipboard. */ @@ -1332,7 +1333,7 @@ void QDeclarative1TextEdit::copy() } /*! - \qmlmethod TextEdit::paste() + \qmlmethod QtQuick1::TextEdit::paste() Replaces the currently selected text by the contents of the system clipboard. */ @@ -1479,7 +1480,7 @@ void QDeclarative1TextEdit::updateImgCache(const QRectF &rf) } /*! - \qmlproperty bool TextEdit::smooth + \qmlproperty bool QtQuick1::TextEdit::smooth This property holds whether the text is smoothly scaled or transformed. @@ -1493,7 +1494,7 @@ void QDeclarative1TextEdit::updateImgCache(const QRectF &rf) */ /*! - \qmlproperty bool TextEdit::canPaste + \qmlproperty bool QtQuick1::TextEdit::canPaste \since QtQuick 1.1 Returns true if the TextEdit is writable and the content of the clipboard is @@ -1506,7 +1507,7 @@ bool QDeclarative1TextEdit::canPaste() const } /*! - \qmlproperty bool TextEdit::inputMethodComposing + \qmlproperty bool QtQuick1::TextEdit::inputMethodComposing \since QtQuick 1.1 @@ -1766,7 +1767,7 @@ void QDeclarative1TextEditPrivate::updateDefaultTextOption() /*! - \qmlmethod void TextEdit::openSoftwareInputPanel() + \qmlmethod void QtQuick1::TextEdit::openSoftwareInputPanel() Opens software input panels like virtual keyboards for typing, useful for customizing when you want the input keyboard to be shown and hidden in @@ -1817,7 +1818,7 @@ void QDeclarative1TextEdit::openSoftwareInputPanel() } /*! - \qmlmethod void TextEdit::closeSoftwareInputPanel() + \qmlmethod void QtQuick1::TextEdit::closeSoftwareInputPanel() Closes a software input panel like a virtual keyboard shown on the screen, useful for customizing when you want the input keyboard to be shown and hidden in diff --git a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp index 53be1d3dfa..9176bbd616 100644 --- a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp @@ -62,8 +62,9 @@ QT_BEGIN_NAMESPACE /*! \qmlclass TextInput QDeclarative1TextInput + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements - \since 4.7 + \since QtQuick 1.0 \brief The TextInput item displays an editable line of text. \inherits Item @@ -91,7 +92,7 @@ QDeclarative1TextInput::~QDeclarative1TextInput() } /*! - \qmlproperty string TextInput::text + \qmlproperty string QtQuick1::TextInput::text The text in the TextInput. */ @@ -111,7 +112,7 @@ void QDeclarative1TextInput::setText(const QString &s) } /*! - \qmlproperty string TextInput::font.family + \qmlproperty string QtQuick1::TextInput::font.family Sets the family name of the font. @@ -121,13 +122,13 @@ void QDeclarative1TextInput::setText(const QString &s) */ /*! - \qmlproperty bool TextInput::font.bold + \qmlproperty bool QtQuick1::TextInput::font.bold Sets whether the font weight is bold. */ /*! - \qmlproperty enumeration TextInput::font.weight + \qmlproperty enumeration QtQuick1::TextInput::font.weight Sets the font's weight. @@ -146,31 +147,31 @@ void QDeclarative1TextInput::setText(const QString &s) */ /*! - \qmlproperty bool TextInput::font.italic + \qmlproperty bool QtQuick1::TextInput::font.italic Sets whether the font has an italic style. */ /*! - \qmlproperty bool TextInput::font.underline + \qmlproperty bool QtQuick1::TextInput::font.underline Sets whether the text is underlined. */ /*! - \qmlproperty bool TextInput::font.strikeout + \qmlproperty bool QtQuick1::TextInput::font.strikeout Sets whether the font has a strikeout style. */ /*! - \qmlproperty real TextInput::font.pointSize + \qmlproperty real QtQuick1::TextInput::font.pointSize Sets the font size in points. The point size must be greater than zero. */ /*! - \qmlproperty int TextInput::font.pixelSize + \qmlproperty int QtQuick1::TextInput::font.pixelSize Sets the font size in pixels. @@ -179,7 +180,7 @@ void QDeclarative1TextInput::setText(const QString &s) */ /*! - \qmlproperty real TextInput::font.letterSpacing + \qmlproperty real QtQuick1::TextInput::font.letterSpacing Sets the letter spacing for the font. @@ -188,7 +189,7 @@ void QDeclarative1TextInput::setText(const QString &s) */ /*! - \qmlproperty real TextInput::font.wordSpacing + \qmlproperty real QtQuick1::TextInput::font.wordSpacing Sets the word spacing for the font. @@ -198,7 +199,7 @@ void QDeclarative1TextInput::setText(const QString &s) */ /*! - \qmlproperty enumeration TextInput::font.capitalization + \qmlproperty enumeration QtQuick1::TextInput::font.capitalization Sets the capitalization for the text. @@ -248,7 +249,7 @@ void QDeclarative1TextInput::setFont(const QFont &font) } /*! - \qmlproperty color TextInput::color + \qmlproperty color QtQuick1::TextInput::color The text color. */ @@ -271,7 +272,7 @@ void QDeclarative1TextInput::setColor(const QColor &c) /*! - \qmlproperty color TextInput::selectionColor + \qmlproperty color QtQuick1::TextInput::selectionColor The text highlight color, used behind selections. */ @@ -299,7 +300,7 @@ void QDeclarative1TextInput::setSelectionColor(const QColor &color) } /*! - \qmlproperty color TextInput::selectedTextColor + \qmlproperty color QtQuick1::TextInput::selectedTextColor The highlighted text color, used in selections. */ @@ -327,8 +328,8 @@ void QDeclarative1TextInput::setSelectedTextColor(const QColor &color) } /*! - \qmlproperty enumeration TextInput::horizontalAlignment - \qmlproperty enumeration TextInput::effectiveHorizontalAlignment + \qmlproperty enumeration QtQuick1::TextInput::horizontalAlignment + \qmlproperty enumeration QtQuick1::TextInput::effectiveHorizontalAlignment Sets the horizontal alignment of the text within the TextInput item's width and height. By default, the text alignment follows the natural alignment @@ -430,7 +431,7 @@ void QDeclarative1TextInputPrivate::mirrorChange() } /*! - \qmlproperty bool TextInput::readOnly + \qmlproperty bool QtQuick1::TextInput::readOnly Sets whether user input can modify the contents of the TextInput. @@ -458,7 +459,7 @@ void QDeclarative1TextInput::setReadOnly(bool ro) } /*! - \qmlproperty int TextInput::maximumLength + \qmlproperty int QtQuick1::TextInput::maximumLength The maximum permitted length of the text in the TextInput. If the text is too long, it is truncated at the limit. @@ -483,7 +484,7 @@ void QDeclarative1TextInput::setMaxLength(int ml) } /*! - \qmlproperty bool TextInput::cursorVisible + \qmlproperty bool QtQuick1::TextInput::cursorVisible Set to true when the TextInput shows a cursor. This property is set and unset when the TextInput gets active focus, so that other @@ -530,7 +531,7 @@ void QDeclarative1TextInput::setCursorVisible(bool on) } /*! - \qmlproperty int TextInput::cursorPosition + \qmlproperty int QtQuick1::TextInput::cursorPosition The position of the cursor in the TextInput. */ int QDeclarative1TextInput::cursorPosition() const @@ -562,7 +563,7 @@ QRect QDeclarative1TextInput::cursorRectangle() const } /*! - \qmlproperty int TextInput::selectionStart + \qmlproperty int QtQuick1::TextInput::selectionStart The cursor position before the first character in the current selection. Setting this and selectionEnd allows you to specify a selection in the @@ -580,7 +581,7 @@ int QDeclarative1TextInput::selectionStart() const } /*! - \qmlproperty int TextInput::selectionEnd + \qmlproperty int QtQuick1::TextInput::selectionEnd The cursor position after the last character in the current selection. Setting this and selectionStart allows you to specify a selection in the @@ -598,7 +599,7 @@ int QDeclarative1TextInput::selectionEnd() const } /*! - \qmlmethod void TextInput::select(int start, int end) + \qmlmethod void QtQuick1::TextInput::select(int start, int end) Causes the text from \a start to \a end to be selected. @@ -619,7 +620,7 @@ void QDeclarative1TextInput::select(int start, int end) } /*! - \qmlproperty string TextInput::selectedText + \qmlproperty string QtQuick1::TextInput::selectedText This read-only property provides the text currently selected in the text input. @@ -639,7 +640,7 @@ QString QDeclarative1TextInput::selectedText() const } /*! - \qmlproperty bool TextInput::activeFocusOnPress + \qmlproperty bool QtQuick1::TextInput::activeFocusOnPress Whether the TextInput should gain active focus on a mouse press. By default this is set to true. @@ -662,7 +663,7 @@ void QDeclarative1TextInput::setFocusOnPress(bool b) } /*! - \qmlproperty bool TextInput::autoScroll + \qmlproperty bool QtQuick1::TextInput::autoScroll Whether the TextInput should scroll when the text is longer than the width. By default this is set to true. @@ -688,6 +689,7 @@ void QDeclarative1TextInput::setAutoScroll(bool b) /*! \qmlclass IntValidator QIntValidator + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements This element provides a validator for integer values. @@ -698,13 +700,13 @@ void QDeclarative1TextInput::setAutoScroll(bool b) locale. */ /*! - \qmlproperty int IntValidator::top + \qmlproperty int QtQuick1::IntValidator::top This property holds the validator's highest acceptable value. By default, this property's value is derived from the highest signed integer available (typically 2147483647). */ /*! - \qmlproperty int IntValidator::bottom + \qmlproperty int QtQuick1::IntValidator::bottom This property holds the validator's lowest acceptable value. By default, this property's value is derived from the lowest signed integer available (typically -2147483647). @@ -712,31 +714,32 @@ void QDeclarative1TextInput::setAutoScroll(bool b) /*! \qmlclass DoubleValidator QDoubleValidator + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements This element provides a validator for non-integer numbers. */ /*! - \qmlproperty real DoubleValidator::top + \qmlproperty real QtQuick1::DoubleValidator::top This property holds the validator's maximum acceptable value. By default, this property contains a value of infinity. */ /*! - \qmlproperty real DoubleValidator::bottom + \qmlproperty real QtQuick1::DoubleValidator::bottom This property holds the validator's minimum acceptable value. By default, this property contains a value of -infinity. */ /*! - \qmlproperty int DoubleValidator::decimals + \qmlproperty int QtQuick1::DoubleValidator::decimals This property holds the validator's maximum number of digits after the decimal point. By default, this property contains a value of 1000. */ /*! - \qmlproperty enumeration DoubleValidator::notation + \qmlproperty enumeration QtQuick1::DoubleValidator::notation This property holds the notation of how a string can describe a number. The possible values for this property are: @@ -751,13 +754,14 @@ void QDeclarative1TextInput::setAutoScroll(bool b) /*! \qmlclass RegExpValidator QRegExpValidator + \inqmlmodule QtQuick 1 \ingroup qml-basic-visual-elements This element provides a validator, which counts as valid any string which matches a specified regular expression. */ /*! - \qmlproperty regExp RegExpValidator::regExp + \qmlproperty regExp QtQuick1::RegExpValidator::regExp This property holds the regular expression used for validation. @@ -768,7 +772,7 @@ void QDeclarative1TextInput::setAutoScroll(bool b) */ /*! - \qmlproperty Validator TextInput::validator + \qmlproperty Validator QtQuick1::TextInput::validator Allows you to set a validator on the TextInput. When a validator is set the TextInput will only accept input which leaves the text property in @@ -814,7 +818,7 @@ void QDeclarative1TextInput::setValidator(QValidator* v) #endif // QT_NO_VALIDATOR /*! - \qmlproperty string TextInput::inputMask + \qmlproperty string QtQuick1::TextInput::inputMask Allows you to set an input mask on the TextInput, restricting the allowable text inputs. See QLineEdit::inputMask for further details, as the exact @@ -839,7 +843,7 @@ void QDeclarative1TextInput::setInputMask(const QString &im) } /*! - \qmlproperty bool TextInput::acceptableInput + \qmlproperty bool QtQuick1::TextInput::acceptableInput This property is always true unless a validator or input mask has been set. If a validator or input mask has been set, this property will only be true @@ -853,7 +857,7 @@ bool QDeclarative1TextInput::hasAcceptableInput() const } /*! - \qmlsignal TextInput::onAccepted() + \qmlsignal QtQuick1::TextInput::onAccepted() This handler is called when the Return or Enter key is pressed. Note that if there is a \l validator or \l inputMask set on the text @@ -878,7 +882,7 @@ void QDeclarative1TextInputPrivate::updateInputMethodHints() } /*! - \qmlproperty enumeration TextInput::echoMode + \qmlproperty enumeration QtQuick1::TextInput::echoMode Specifies how the text should be displayed in the TextInput. \list @@ -921,7 +925,7 @@ void QDeclarative1TextInput::setIMHints(Qt::InputMethodHints hints) } /*! - \qmlproperty Component TextInput::cursorDelegate + \qmlproperty Component QtQuick1::TextInput::cursorDelegate The delegate for the cursor in the TextInput. If you set a cursorDelegate for a TextInput, this delegate will be used for @@ -995,7 +999,7 @@ void QDeclarative1TextInput::createCursor() } /*! - \qmlmethod rect TextInput::positionToRectangle(int pos) + \qmlmethod rect QtQuick1::TextInput::positionToRectangle(int pos) This function takes a character position and returns the rectangle that the cursor would occupy, if it was placed at that character position. @@ -1020,7 +1024,7 @@ int QDeclarative1TextInput::positionAt(int x) const } /*! - \qmlmethod int TextInput::positionAt(int x, CursorPosition position = CursorBetweenCharacters) + \qmlmethod int QtQuick1::TextInput::positionAt(int x, CursorPosition position = CursorBetweenCharacters) \since Quick 1.1 This function returns the character position at @@ -1408,7 +1412,7 @@ QVariant QDeclarative1TextInput::inputMethodQuery(Qt::InputMethodQuery property) } /*! - \qmlmethod void TextInput::deselect() + \qmlmethod void QtQuick1::TextInput::deselect() \since Quick 1.1 Removes active text selection. @@ -1420,7 +1424,7 @@ void QDeclarative1TextInput::deselect() } /*! - \qmlmethod void TextInput::selectAll() + \qmlmethod void QtQuick1::TextInput::selectAll() Causes all text to be selected. */ @@ -1431,7 +1435,7 @@ void QDeclarative1TextInput::selectAll() } /*! - \qmlmethod void TextInput::isRightToLeft(int start, int end) + \qmlmethod void QtQuick1::TextInput::isRightToLeft(int start, int end) Returns true if the natural reading direction of the editor text found between positions \a start and \a end is right to left. @@ -1449,7 +1453,7 @@ bool QDeclarative1TextInput::isRightToLeft(int start, int end) #ifndef QT_NO_CLIPBOARD /*! - \qmlmethod TextInput::cut() + \qmlmethod QtQuick1::TextInput::cut() Moves the currently selected text to the system clipboard. */ @@ -1461,7 +1465,7 @@ void QDeclarative1TextInput::cut() } /*! - \qmlmethod TextInput::copy() + \qmlmethod QtQuick1::TextInput::copy() Copies the currently selected text to the system clipboard. */ @@ -1472,7 +1476,7 @@ void QDeclarative1TextInput::copy() } /*! - \qmlmethod TextInput::paste() + \qmlmethod QtQuick1::TextInput::paste() Replaces the currently selected text by the contents of the system clipboard. */ @@ -1485,7 +1489,7 @@ void QDeclarative1TextInput::paste() #endif // QT_NO_CLIPBOARD /*! - \qmlmethod void TextInput::selectWord() + \qmlmethod void QtQuick1::TextInput::selectWord() Causes the word closest to the current cursor position to be selected. */ @@ -1496,7 +1500,7 @@ void QDeclarative1TextInput::selectWord() } /*! - \qmlproperty bool TextInput::smooth + \qmlproperty bool QtQuick1::TextInput::smooth This property holds whether the text is smoothly scaled or transformed. @@ -1510,7 +1514,7 @@ void QDeclarative1TextInput::selectWord() */ /*! - \qmlproperty string TextInput::passwordCharacter + \qmlproperty string QtQuick1::TextInput::passwordCharacter This is the character displayed when echoMode is set to Password or PasswordEchoOnEdit. By default it is an asterisk. @@ -1539,7 +1543,7 @@ void QDeclarative1TextInput::setPasswordCharacter(const QString &str) } /*! - \qmlproperty string TextInput::displayText + \qmlproperty string QtQuick1::TextInput::displayText This is the text displayed in the TextInput. @@ -1555,7 +1559,7 @@ QString QDeclarative1TextInput::displayText() const } /*! - \qmlproperty bool TextInput::selectByMouse + \qmlproperty bool QtQuick1::TextInput::selectByMouse Defaults to false. @@ -1580,7 +1584,7 @@ void QDeclarative1TextInput::setSelectByMouse(bool on) } /*! - \qmlproperty enum TextInput::mouseSelectionMode + \qmlproperty enum QtQuick1::TextInput::mouseSelectionMode \since Quick 1.1 Specifies how text should be selected using a mouse. @@ -1609,7 +1613,7 @@ void QDeclarative1TextInput::setMouseSelectionMode(SelectionMode mode) } /*! - \qmlproperty bool TextInput::canPaste + \qmlproperty bool QtQuick1::TextInput::canPaste \since QtQuick 1.1 Returns true if the TextInput is writable and the content of the clipboard is @@ -1628,7 +1632,7 @@ void QDeclarative1TextInput::moveCursorSelection(int position) } /*! - \qmlmethod void TextInput::moveCursorSelection(int position, SelectionMode mode = TextInput.SelectCharacters) + \qmlmethod void QtQuick1::TextInput::moveCursorSelection(int position, SelectionMode mode = TextInput.SelectCharacters) \since Quick 1.1 Moves the cursor to \a position and updates the selection according to the optional \a mode @@ -1722,7 +1726,7 @@ void QDeclarative1TextInput::moveCursorSelection(int pos, SelectionMode mode) } /*! - \qmlmethod void TextInput::openSoftwareInputPanel() + \qmlmethod void QtQuick1::TextInput::openSoftwareInputPanel() Opens software input panels like virtual keyboards for typing, useful for customizing when you want the input keyboard to be shown and hidden in @@ -1773,7 +1777,7 @@ void QDeclarative1TextInput::openSoftwareInputPanel() } /*! - \qmlmethod void TextInput::closeSoftwareInputPanel() + \qmlmethod void QtQuick1::TextInput::closeSoftwareInputPanel() Closes a software input panel like a virtual keyboard shown on the screen, useful for customizing when you want the input keyboard to be shown and hidden in @@ -1836,7 +1840,7 @@ void QDeclarative1TextInput::focusInEvent(QFocusEvent *event) } /*! - \qmlproperty bool TextInput::inputMethodComposing + \qmlproperty bool QtQuick1::TextInput::inputMethodComposing \since QtQuick 1.1 diff --git a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp index e712ca1888..c8627b9d26 100644 --- a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -130,8 +130,9 @@ public: /*! \qmlclass VisualItemModel QDeclarative1VisualItemModel + \inqmlmodule QtQuick 1 \ingroup qml-working-with-data - \since 4.7 + \since QtQuick 1.0 \brief The VisualItemModel allows items to be provided to a view. A VisualItemModel contains the visual items to be used in a view. @@ -185,7 +186,7 @@ QDeclarativeListProperty<QDeclarativeItem> QDeclarative1VisualItemModel::childre } /*! - \qmlproperty int VisualItemModel::count + \qmlproperty int QtQuick1::VisualItemModel::count The number of items in the model. This property is readonly. */ @@ -643,6 +644,7 @@ QDeclarative1VisualDataModelData *QDeclarative1VisualDataModelPrivate::data(QObj /*! \qmlclass VisualDataModel QDeclarative1VisualDataModel + \inqmlmodule QtQuick 1 \ingroup qml-working-with-data \brief The VisualDataModel encapsulates a model and delegate @@ -680,7 +682,7 @@ QDeclarative1VisualDataModel::~QDeclarative1VisualDataModel() } /*! - \qmlproperty model VisualDataModel::model + \qmlproperty model QtQuick1::VisualDataModel::model This property holds the model providing data for the VisualDataModel. The model provides a set of data that is used to create the items @@ -804,7 +806,7 @@ void QDeclarative1VisualDataModel::setModel(const QVariant &model) } /*! - \qmlproperty Component VisualDataModel::delegate + \qmlproperty Component QtQuick1::VisualDataModel::delegate The delegate provides a template defining each item instantiated by a view. The index is exposed as an accessible \c index property. Properties of the @@ -835,7 +837,7 @@ void QDeclarative1VisualDataModel::setDelegate(QDeclarativeComponent *delegate) } /*! - \qmlproperty QModelIndex VisualDataModel::rootIndex + \qmlproperty QModelIndex QtQuick1::VisualDataModel::rootIndex QAbstractItemModel provides a hierarchical tree of data, whereas QML only operates on list data. \c rootIndex allows the children of @@ -891,7 +893,7 @@ void QDeclarative1VisualDataModel::setRootIndex(const QVariant &root) /*! - \qmlmethod QModelIndex VisualDataModel::modelIndex(int index) + \qmlmethod QModelIndex QtQuick1::VisualDataModel::modelIndex(int index) QAbstractItemModel provides a hierarchical tree of data, whereas QML only operates on list data. This function assists in using @@ -911,7 +913,7 @@ QVariant QDeclarative1VisualDataModel::modelIndex(int idx) const } /*! - \qmlmethod QModelIndex VisualDataModel::parentModelIndex() + \qmlmethod QModelIndex QtQuick1::VisualDataModel::parentModelIndex() QAbstractItemModel provides a hierarchical tree of data, whereas QML only operates on list data. This function assists in using @@ -1007,7 +1009,7 @@ QDeclarative1VisualDataModel::ReleaseFlags QDeclarative1VisualDataModel::release } /*! - \qmlproperty object VisualDataModel::parts + \qmlproperty object QtQuick1::VisualDataModel::parts The \a parts property selects a VisualDataModel which creates delegates from the part named. This is used in conjunction with |