diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-10-01 13:03:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 14:40:01 +0200 |
| commit | 4706b1ceff9af9141044ed3cf020ce5624bfa40f (patch) | |
| tree | 43672217a945512ddd1704468d1fd4b6e9c153c7 /src/quick | |
| parent | 4f50ab594aa2fb1d38981127beca634ad3396489 (diff) | |
qdoc: no longer recognizes the version nr in QML refs
All QML references of the form
<QML-module-name><QML-module-version>::<QML-type>::<member-name> have
had the <QML-module-version> removed i.
Task-number: QTBUG-33776
Change-Id: Idde279e0f254cd24ea44f9841662dd81a2c5bbc6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/quick')
56 files changed, 1160 insertions, 1160 deletions
diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc index 966bd9d804..be8b397a8e 100644 --- a/src/quick/doc/src/advtutorial.qdoc +++ b/src/quick/doc/src/advtutorial.qdoc @@ -163,7 +163,7 @@ and moves the new block to its position on the game canvas. This involves severa \list -\li \l {QtQml2::Qt::createComponent()}{Qt.createComponent()} is called to +\li \l {QtQml::Qt::createComponent()}{Qt.createComponent()} is called to generate a type from \c Block.qml. If the component is ready, we can call \c createObject() to create an instance of the \c Block item. diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc index bc67594960..1c48058510 100644 --- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc +++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc @@ -138,7 +138,7 @@ The painting of these icons can be mirrored with a dedicated \c mirror property \section1 Default layout direction -The \l {QtQml2::Qt::application}{Qt.application.layoutDirection} property can be used to query the active layout direction of the +The \l {QtQml::Qt::application}{Qt.application.layoutDirection} property can be used to query the active layout direction of the application. It is based on QApplication::layoutDirection(), which most commonly determines the layout direction from the active language translation file. diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc index c579d0f7ef..2f07b7b234 100644 --- a/src/quick/doc/src/dynamicview-tutorial.qdoc +++ b/src/quick/doc/src/dynamicview-tutorial.qdoc @@ -108,8 +108,8 @@ the view and cannot be moved by other means. \snippet tutorials/dynamicview/dynamicview2/dynamicview.qml 2 Dragging the content item is enabled by binding it to the MouseArea's -\l {QtQuick2::MouseArea::drag.target}{drag.target} property. Because we still want the view to be -flickable we wait until the MouseArea's \l {QtQuick2::MouseArea::onPressAndHold}{onPressAndHold} +\l {QtQuick::MouseArea::drag.target}{drag.target} property. Because we still want the view to be +flickable we wait until the MouseArea's \l {QtQuick::MouseArea::onPressAndHold}{onPressAndHold} handler is triggered before binding the drag target. This way when mouse moves before the hold timeout has expired it is interpreted as moving the list and if it moves after it is interpreted as dragging an item. To make it more obvious to the user when an item can be dragged we'll change the @@ -153,7 +153,7 @@ it is attached to moves. Drag events are only sent while the active property is true, so in this example the first event would be sent when the delegate was held with additional event sents when dragging. The -\l {QtQuick2::Drag::hotSpot}{hotSpot} property specifies the relative position of the drag events +\l {QtQuick::Drag::hotSpot}{hotSpot} property specifies the relative position of the drag events within the dragged item, the center of the item in this instance. Then we use a DropArea in each view item to determine when the hot spot of the dragged item @@ -165,14 +165,14 @@ to the index of the item it was dragged over. To move the items within the view we use a VisualDataModel. The VisualDataModel type is used by the view types to instantiate delegate items from model data and when constructed explicitly can be used to filter and re-order the model items provided to ListView. The -\l {QtQuick2::VisualDataModel::items}{items} property of VisualDataModel provides access to the +\l {QtQuick::VisualDataModel::items}{items} property of VisualDataModel provides access to the view's items and allows us to change the visible order without modifying the source model. To -determine the current visible index of the items we use \l {QtQuick2::VisualDataModel::itemsIndex} +determine the current visible index of the items we use \l {QtQuick::VisualDataModel::itemsIndex} {itemsIndex} property on the VisualDataModel attached property of the delegate item. -To utilize a VisualDataModel with a ListView we bind it to the \l {QtQuick2::ListView::model}{model} -property of the view and bind the \l {QtQuick2::VisualDataModel::model}{model} and -\l {QtQuick2::VisualDataModel::delegate}{delegate} to the VisualDataModel. +To utilize a VisualDataModel with a ListView we bind it to the \l {QtQuick::ListView::model}{model} +property of the view and bind the \l {QtQuick::VisualDataModel::model}{model} and +\l {QtQuick::VisualDataModel::delegate}{delegate} to the VisualDataModel. \snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 4 @@ -194,7 +194,7 @@ like this: \section2 Walkthrough Items in a VisualDataModel are filtered into groups represented by the VisualDataGroup type, -normally all items in the model belong to a default \l {QtQuick2::VisualDataModel::items}{items} +normally all items in the model belong to a default \l {QtQuick::VisualDataModel::items}{items} group but this default can be changed with the includeByDefault property. To implement our sorting we want items to first be added to an unsorted group from where we can transfer them to a sorted position in the items group. To do that we clear includeByDefault on the items group and set it on @@ -208,7 +208,7 @@ item and then transfer the item to the items group before moving it to the pre-d repeat until the unsorted group is empty. To find the insert position for an item we request a handle for the item from the unsorted group -with the \l {QtQuick2::VisualDataModel::get} {get} function. Through the model property on this +with the \l {QtQuick::VisualDataModel::get} {get} function. Through the model property on this handle we can access the same model data that is available in a delegate instance of that item and compare against other items to determine relative position. @@ -220,7 +220,7 @@ of the list. In this example it can be one of the following: \snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 4 A sort is triggered whenever new items are added to the unsorted VisualDataGroup which we are -notified of by the \l {QtQuick2::VisualDataGroup::onChanged}{onChanged} handler. If no sort +notified of by the \l {QtQuick::VisualDataGroup::onChanged}{onChanged} handler. If no sort function is currently selected we simply transfer all items from the unsorted group to the items group, otherwise we call sort with the selected sort function. @@ -228,8 +228,8 @@ group, otherwise we call sort with the selected sort function. Finally when the selected sort order changes we can trigger a full re-sort of the list by moving all items from the items group to the unsorted group, which will trigger the -\l {QtQuick2::VisualDataGroup::onChanged}{onChanged} handler and transfer the items back to the -items group in correct order. Note that the \l {QtQuick2::VisualDataGroup::onChanged}{onChanged} +\l {QtQuick::VisualDataGroup::onChanged}{onChanged} handler and transfer the items back to the +items group in correct order. Note that the \l {QtQuick::VisualDataGroup::onChanged}{onChanged} handler will not be invoked recursively so there's no issue with it being invoked during a sort. \snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 6 diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index d247b33e31..e3b2f4640d 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -84,9 +84,9 @@ In addition, the \c QtQuick module provides the following basic types: \section1 Object Types All of the object types provided by \c QtQuick are based on the \l{Item} type, -which itself derives from \l{QtQml2::QtObject}{QtObject}. \l{qtqml-typereference-topic.html#object-types} +which itself derives from \l{QtQml::QtObject}{QtObject}. \l{qtqml-typereference-topic.html#object-types} {QML object types} provided by the Qt QML module -(such as \l{QtQml2::QtObject}{QtObject} and \l{QtQml2::Component}{Component}) are also available when +(such as \l{QtQml::QtObject}{QtObject} and \l{QtQml::Component}{Component}) are also available when you import \c QtQuick. \section2 Visual Types @@ -330,9 +330,9 @@ For more details about the module itself, see the \l{Qt Quick} module page. \li By a hexadecimal triplet or quad in the form \c "#RRGGBB" and \c "#AARRGGBB" respectively. For example, the color red corresponds to a triplet of \c "#FF0000" and a slightly transparent blue to a quad of \c "#800000FF". - \li Using the \l{QtQml2::Qt::rgba()}{Qt.rgba()}, \l{QtQml2::Qt::hsla()}{Qt.hsla()}, - \l{QtQml2::Qt::darker()}{Qt.darker()}, \l{QtQml2::Qt::lighter()}{Qt.lighter()} or - \l{QtQml2::Qt::tint()}{Qt.tint()} functions. + \li Using the \l{QtQml::Qt::rgba()}{Qt.rgba()}, \l{QtQml::Qt::hsla()}{Qt.hsla()}, + \l{QtQml::Qt::darker()}{Qt.darker()}, \l{QtQml::Qt::lighter()}{Qt.lighter()} or + \l{QtQml::Qt::tint()}{Qt.tint()} functions. \endlist Example: @@ -354,7 +354,7 @@ For more details about the module itself, see the \l{Qt Quick} module page. } \endqml - To test color values for equality, use the \l{QtQml2::Qt::colorEqual()}{Qt.colorEqual()} + To test color values for equality, use the \l{QtQml::Qt::colorEqual()}{Qt.colorEqual()} function. This allows colors to be accurately compared whether they are in property form or in any of the acceptable string specification forms. @@ -595,7 +595,7 @@ console.log(c + " " + d); // false true Rotation { angle: 60; axis: "0,1,0" } \endqml - or with the \l{QtQml2::Qt::vector3d()}{Qt.vector3d()} function: + or with the \l{QtQml::Qt::vector3d()}{Qt.vector3d()} function: \qml Rotation { angle: 60; axis: Qt.vector3d(0, 1, 0) } diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 7be2bc3100..d9feb8d8eb 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -305,7 +305,7 @@ QQuickCanvasItem::~QQuickCanvasItem() } /*! - \qmlproperty size QtQuick2::Canvas::available + \qmlproperty size QtQuick::Canvas::available Indicates when Canvas is able to provide a drawing context to operate on. */ @@ -316,7 +316,7 @@ bool QQuickCanvasItem::isAvailable() const } /*! - \qmlproperty string QtQuick2::Canvas::contextType + \qmlproperty string QtQuick::Canvas::contextType The type of drawing context to use. This property is set to the name of the active context type. @@ -356,7 +356,7 @@ void QQuickCanvasItem::setContextType(const QString &contextType) } /*! - \qmlproperty object QtQuick2::Canvas::context + \qmlproperty object QtQuick::Canvas::context Holds the active drawing context. If the canvas is ready and there has been a successful call to getContext() @@ -374,7 +374,7 @@ QQmlV4Handle QQuickCanvasItem::context() const } /*! - \qmlproperty size QtQuick2::Canvas::canvasSize + \qmlproperty size QtQuick::Canvas::canvasSize Holds the logical canvas size that the context paints on. By default, the canvas size is the same size as the current canvas item @@ -407,7 +407,7 @@ void QQuickCanvasItem::setCanvasSize(const QSizeF & size) } /*! - \qmlproperty size QtQuick2::Canvas::tileSize + \qmlproperty size QtQuick::Canvas::tileSize Holds the canvas rendering tile size. The Canvas item enters tiled mode by setting canvasSize, tileSize and the @@ -442,7 +442,7 @@ void QQuickCanvasItem::setTileSize(const QSize & size) } /*! - \qmlproperty rect QtQuick2::Canvas::canvasWindow + \qmlproperty rect QtQuick::Canvas::canvasWindow Holds the current canvas visible window. By default the canvasWindow size is the same as the Canvas item size with @@ -475,7 +475,7 @@ void QQuickCanvasItem::setCanvasWindow(const QRectF& rect) } /*! - \qmlproperty enumeration QtQuick2::Canvas::renderTarget + \qmlproperty enumeration QtQuick::Canvas::renderTarget Holds the current canvas render target. \list @@ -512,7 +512,7 @@ void QQuickCanvasItem::setRenderTarget(QQuickCanvasItem::RenderTarget target) } /*! - \qmlproperty enumeration QtQuick2::Canvas::renderStrategy + \qmlproperty enumeration QtQuick::Canvas::renderStrategy Holds the current canvas rendering strategy. \list @@ -719,7 +719,7 @@ QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData } /*! - \qmlmethod object QtQuick2::Canvas::getContext(string contextId, any... args) + \qmlmethod object QtQuick::Canvas::getContext(string contextId, any... args) Returns a drawing context or null if no context available. @@ -773,7 +773,7 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args) } /*! - \qmlmethod long QtQuick2::Canvas::requestAnimationFrame(callback) + \qmlmethod long QtQuick::Canvas::requestAnimationFrame(callback) This function schedules callback to be invoked before composing the Qt Quick scene. @@ -802,7 +802,7 @@ void QQuickCanvasItem::requestAnimationFrame(QQmlV4Function *args) } /*! - \qmlmethod QtQuick2::Canvas::cancelRequestAnimationFrame(long handle) + \qmlmethod QtQuick::Canvas::cancelRequestAnimationFrame(long handle) This function will cancel the animation callback referenced by \a handle. */ @@ -822,7 +822,7 @@ void QQuickCanvasItem::cancelRequestAnimationFrame(QQmlV4Function *args) /*! - \qmlmethod QtQuick2::Canvas::requestPaint() + \qmlmethod QtQuick::Canvas::requestPaint() Request the entire visible region be re-drawn. @@ -835,7 +835,7 @@ void QQuickCanvasItem::requestPaint() } /*! - \qmlmethod QtQuick2::Canvas::markDirty(rect area) + \qmlmethod QtQuick::Canvas::markDirty(rect area) Mark the given \a area as dirty, so that when this area is visible the canvas renderer will redraw it. This will trigger the onPaint signal @@ -862,7 +862,7 @@ void QQuickCanvasItem::checkAnimationCallbacks() } /*! - \qmlmethod bool QtQuick2::Canvas::save(string filename) + \qmlmethod bool QtQuick::Canvas::save(string filename) Save the current canvas content into an image file \a filename. The saved image format is automatically decided by the \a filename's @@ -891,7 +891,7 @@ QQmlRefPointer<QQuickCanvasPixmap> QQuickCanvasItem::loadedPixmap(const QUrl& ur } /*! - \qmlsignal QtQuick2::Canvas::onImageLoaded() + \qmlsignal QtQuick::Canvas::onImageLoaded() This handler is called when an image has been loaded. @@ -899,7 +899,7 @@ QQmlRefPointer<QQuickCanvasPixmap> QQuickCanvasItem::loadedPixmap(const QUrl& ur */ /*! - \qmlmethod QtQuick2::Canvas::loadImage(url image) + \qmlmethod QtQuick::Canvas::loadImage(url image) Loads the given \c image asynchronously. When the image is ready, onImageLoaded will be emitted. @@ -927,7 +927,7 @@ void QQuickCanvasItem::loadImage(const QUrl& url) } } /*! - \qmlmethod QtQuick2::Canvas::unloadImage(url image) + \qmlmethod QtQuick::Canvas::unloadImage(url image) Unloads the \c image. Once an image is unloaded it cannot be painted by the canvas context @@ -943,7 +943,7 @@ void QQuickCanvasItem::unloadImage(const QUrl& url) } /*! - \qmlmethod QtQuick2::Canvas::isImageError(url image) + \qmlmethod QtQuick::Canvas::isImageError(url image) Returns true if the \a image failed to load. \sa loadImage() @@ -957,7 +957,7 @@ bool QQuickCanvasItem::isImageError(const QUrl& url) const } /*! - \qmlmethod QtQuick2::Canvas::isImageLoading(url image) + \qmlmethod QtQuick::Canvas::isImageLoading(url image) Returns true if the \a image is currently loading. \sa loadImage() @@ -970,7 +970,7 @@ bool QQuickCanvasItem::isImageLoading(const QUrl& url) const && d->pixmaps.value(fullPathUrl)->pixmap()->isLoading(); } /*! - \qmlmethod QtQuick2::Canvas::isImageLoaded(url image) + \qmlmethod QtQuick::Canvas::isImageLoaded(url image) Returns true if the \a image is successfully loaded and ready to use. \sa loadImage() @@ -997,7 +997,7 @@ QImage QQuickCanvasItem::toImage(const QRectF& rect) const } /*! - \qmlmethod string QtQuick2::Canvas::toDataURL(string mimeType) + \qmlmethod string QtQuick::Canvas::toDataURL(string mimeType) Returns a data URL for the image in the canvas. @@ -1093,7 +1093,7 @@ QRect QQuickCanvasItem::tiledRect(const QRectF &window, const QSize &tileSize) } /*! - \qmlsignal QtQuick2::Canvas::onPaint(rect region) + \qmlsignal QtQuick::Canvas::onPaint(rect region) This handler is called to render the \a region. If a context is active it can be referenced from the context property. @@ -1103,7 +1103,7 @@ QRect QQuickCanvasItem::tiledRect(const QRectF &window, const QSize &tileSize) */ /*! - \qmlsignal QtQuick2::Canvas::onPainted() + \qmlsignal QtQuick::Canvas::onPainted() This handler is called after all context painting commands are executed and the Canvas has been rendered. diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 85aa8b21f8..02a813e17f 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -936,7 +936,7 @@ static QV4::ReturnedValue qt_create_image_data(qreal w, qreal h, QV8Engine* engi //static script functions /*! - \qmlproperty QtQuick2::Canvas QtQuick2::Context2D::canvas + \qmlproperty QtQuick::Canvas QtQuick::Context2D::canvas Holds the canvas item that the context paints on. This property is read only. @@ -952,7 +952,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_get_canvas(QV4::SimpleCall } /*! - \qmlmethod object QtQuick2::Context2D::restore() + \qmlmethod object QtQuick::Context2D::restore() Pops the top state on the stack, restoring the context to that state. \sa save() @@ -969,7 +969,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_restore(QV4::SimpleCallCon } /*! - \qmlmethod object QtQuick2::Context2D::reset() + \qmlmethod object QtQuick::Context2D::reset() Resets the context state and properties to the default values. */ QV4::ReturnedValue QQuickJSContext2DPrototype::method_reset(QV4::SimpleCallContext *ctx) @@ -985,7 +985,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_reset(QV4::SimpleCallConte } /*! - \qmlmethod object QtQuick2::Context2D::save() + \qmlmethod object QtQuick::Context2D::save() Pushes the current state onto the state stack. Before changing any state attributes, you should save the current state @@ -1028,7 +1028,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_save(QV4::SimpleCallContex // transformations /*! - \qmlmethod object QtQuick2::Context2D::rotate(real angle) + \qmlmethod object QtQuick::Context2D::rotate(real angle) Rotate the canvas around the current origin by \a angle in radians and clockwise direction. \code @@ -1057,7 +1057,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_rotate(QV4::SimpleCallCont } /*! - \qmlmethod object QtQuick2::Context2D::scale(real x, real y) + \qmlmethod object QtQuick::Context2D::scale(real x, real y) Increases or decreases the size of each unit in the canvas grid by multiplying the scale factors to the current tranform matrix. @@ -1087,7 +1087,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_scale(QV4::SimpleCallConte } /*! - \qmlmethod object QtQuick2::Context2D::setTransform(real a, real b, real c, real d, real e, real f) + \qmlmethod object QtQuick::Context2D::setTransform(real a, real b, real c, real d, real e, real f) Changes the transformation matrix to the matrix given by the arguments as described below. Modifying the transformation matrix directly enables you to perform scaling, @@ -1139,7 +1139,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_setTransform(QV4::SimpleCa } /*! - \qmlmethod object QtQuick2::Context2D::transform(real a, real b, real c, real d, real e, real f) + \qmlmethod object QtQuick::Context2D::transform(real a, real b, real c, real d, real e, real f) This method is very similar to setTransform(), but instead of replacing the old transform matrix, this method applies the given tranform matrix to the current matrix by multiplying to it. @@ -1168,7 +1168,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_transform(QV4::SimpleCallC } /*! - \qmlmethod object QtQuick2::Context2D::translate(real x, real y) + \qmlmethod object QtQuick::Context2D::translate(real x, real y) Translates the origin of the canvas by a horizontal distance of \a x, and a vertical distance of \a y, in coordinate space units. @@ -1190,7 +1190,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_translate(QV4::SimpleCallC /*! - \qmlmethod object QtQuick2::Context2D::resetTransform() + \qmlmethod object QtQuick::Context2D::resetTransform() Reset the transformation matrix to the default value (equivalent to calling setTransform(\c 1, \c 0, \c 0, \c 1, \c 0, \c 0)). @@ -1211,7 +1211,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_resetTransform(QV4::Simple /*! - \qmlmethod object QtQuick2::Context2D::shear(real sh, real sv) + \qmlmethod object QtQuick::Context2D::shear(real sh, real sv) Shears the transformation matrix by \a sh in the horizontal direction and \a sv in the vertical direction. @@ -1231,7 +1231,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_shear(QV4::SimpleCallConte // compositing /*! - \qmlproperty real QtQuick2::Context2D::globalAlpha + \qmlproperty real QtQuick::Context2D::globalAlpha Holds the current alpha value applied to rendering operations. The value must be in the range from \c 0.0 (fully transparent) to \c 1.0 (fully opaque). @@ -1267,7 +1267,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_globalAlpha(QV4::SimpleCallCont } /*! - \qmlproperty string QtQuick2::Context2D::globalCompositeOperation + \qmlproperty string QtQuick::Context2D::globalCompositeOperation Holds the current the current composition operation, from the list below: \list \li source-atop - A atop B. Display the source image wherever both images are opaque. @@ -1326,7 +1326,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_globalCompositeOperation(QV4::S // colors and styles /*! - \qmlproperty variant QtQuick2::Context2D::fillStyle + \qmlproperty variant QtQuick::Context2D::fillStyle Holds the current style used for filling shapes. The style can be either a string containing a CSS color, a CanvasGradient or CanvasPattern object. Invalid values are ignored. This property accepts several color syntaxes: @@ -1406,7 +1406,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_fillStyle(QV4::SimpleCallContex return QV4::Encode::undefined(); } /*! - \qmlproperty enumeration QtQuick2::Context2D::fillRule + \qmlproperty enumeration QtQuick::Context2D::fillRule Holds the current fill rule used for filling shapes. The following fill rules supported: \list \li Qt.OddEvenFill @@ -1450,7 +1450,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_fillRule(QV4::SimpleCallContext return QV4::Encode::undefined(); } /*! - \qmlproperty variant QtQuick2::Context2D::strokeStyle + \qmlproperty variant QtQuick::Context2D::strokeStyle Holds the current color or style to use for the lines around shapes, The style can be either a string containing a CSS color, a CanvasGradient or CanvasPattern object. Invalid values are ignored. @@ -1523,7 +1523,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_strokeStyle(QV4::SimpleCallCont } /*! - \qmlmethod object QtQuick2::Context2D::createLinearGradient(real x0, real y0, real x1, real y1) + \qmlmethod object QtQuick::Context2D::createLinearGradient(real x0, real y0, real x1, real y1) Returns a CanvasGradient object that represents a linear gradient that transitions the color along a line between the start point (\a x0, \a y0) and the end point (\a x1, \a y1). @@ -1574,7 +1574,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createLinearGradient(QV4:: } /*! - \qmlmethod object QtQuick2::Context2D::createRadialGradient(real x0, real y0, real r0, real x1, real y1, real r1) + \qmlmethod object QtQuick::Context2D::createRadialGradient(real x0, real y0, real r0, real x1, real y1, real r1) Returns a CanvasGradient object that represents a radial gradient that paints along the cone given by the start circle with origin (x0, y0) and radius r0, and the end circle with origin (x1, y1) and radius r1. @@ -1629,7 +1629,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createRadialGradient(QV4:: } /*! - \qmlmethod object QtQuick2::Context2D::createConicalGradient(real x, real y, real angle) + \qmlmethod object QtQuick::Context2D::createConicalGradient(real x, real y, real angle) Returns a CanvasGradient object that represents a conical gradient that interpolate colors counter-clockwise around a center point (\c x, \c y) with start angle \c angle in units of radians. @@ -1675,7 +1675,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createConicalGradient(QV4: return ctx->callData->thisObject.asReturnedValue(); } /*! - \qmlmethod variant QtQuick2::Context2D::createPattern(color color, enumeration patternMode) + \qmlmethod variant QtQuick::Context2D::createPattern(color color, enumeration patternMode) This is a overload function. Returns a CanvasPattern object that uses the given \a color and \a patternMode. The valid pattern modes are: @@ -1698,7 +1698,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createConicalGradient(QV4: \sa Qt::BrushStyle */ /*! - \qmlmethod variant QtQuick2::Context2D::createPattern(Image image, string repetition) + \qmlmethod variant QtQuick::Context2D::createPattern(Image image, string repetition) Returns a CanvasPattern object that uses the given image and repeats in the direction(s) given by the repetition argument. The \a image parameter must be a valid Image item, a valid CanvasImageData object or loaded image url, if there is no image data, throws an INVALID_STATE_ERR exception. @@ -1779,7 +1779,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createPattern(QV4::SimpleC // line styles /*! - \qmlproperty string QtQuick2::Context2D::lineCap + \qmlproperty string QtQuick::Context2D::lineCap Holds the current line cap style. The possible line cap styles are: \list @@ -1834,7 +1834,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_lineCap(QV4::SimpleCallContext } /*! - \qmlproperty string QtQuick2::Context2D::lineJoin + \qmlproperty string QtQuick::Context2D::lineJoin Holds the current line join style. A join exists at any point in a subpath shared by two consecutive lines. When a subpath is closed, then a join also exists at its first point (equivalent to its last point) connecting the first and last lines in the subpath. @@ -1895,7 +1895,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_lineJoin(QV4::SimpleCallContext } /*! - \qmlproperty real QtQuick2::Context2D::lineWidth + \qmlproperty real QtQuick::Context2D::lineWidth Holds the current line width. Values that are not finite values greater than zero are ignored. */ QV4::ReturnedValue QQuickJSContext2D::method_get_lineWidth(QV4::SimpleCallContext *ctx) @@ -1925,7 +1925,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_lineWidth(QV4::SimpleCallContex } /*! - \qmlproperty real QtQuick2::Context2D::miterLimit + \qmlproperty real QtQuick::Context2D::miterLimit Holds the current miter limit ratio. The default miter limit value is 10.0. */ @@ -1957,7 +1957,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_miterLimit(QV4::SimpleCallConte // shadows /*! - \qmlproperty real QtQuick2::Context2D::shadowBlur + \qmlproperty real QtQuick::Context2D::shadowBlur Holds the current level of blur applied to shadows */ QV4::ReturnedValue QQuickJSContext2D::method_get_shadowBlur(QV4::SimpleCallContext *ctx) @@ -1987,7 +1987,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_shadowBlur(QV4::SimpleCallConte } /*! - \qmlproperty string QtQuick2::Context2D::shadowColor + \qmlproperty string QtQuick::Context2D::shadowColor Holds the current shadow color. */ QV4::ReturnedValue QQuickJSContext2D::method_get_shadowColor(QV4::SimpleCallContext *ctx) @@ -2020,7 +2020,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_shadowColor(QV4::SimpleCallCont /*! - \qmlproperty qreal QtQuick2::Context2D::shadowOffsetX + \qmlproperty qreal QtQuick::Context2D::shadowOffsetX Holds the current shadow offset in the positive horizontal distance. \sa shadowOffsetY @@ -2050,7 +2050,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_shadowOffsetX(QV4::SimpleCallCo return QV4::Encode::undefined(); } /*! - \qmlproperty qreal QtQuick2::Context2D::shadowOffsetY + \qmlproperty qreal QtQuick::Context2D::shadowOffsetY Holds the current shadow offset in the positive vertical distance. \sa shadowOffsetX @@ -2112,7 +2112,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_path(QV4::SimpleCallContext *ct //rects /*! - \qmlmethod object QtQuick2::Context2D::clearRect(real x, real y, real w, real h) + \qmlmethod object QtQuick::Context2D::clearRect(real x, real y, real w, real h) Clears all pixels on the canvas in the given rectangle to transparent black. */ QV4::ReturnedValue QQuickJSContext2DPrototype::method_clearRect(QV4::SimpleCallContext *ctx) @@ -2132,7 +2132,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_clearRect(QV4::SimpleCallC return ctx->callData->thisObject.asReturnedValue(); } /*! - \qmlmethod object QtQuick2::Context2D::fillRect(real x, real y, real w, real h) + \qmlmethod object QtQuick::Context2D::fillRect(real x, real y, real w, real h) Paint the specified rectangular area using the fillStyle. \sa fillStyle @@ -2150,7 +2150,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillRect(QV4::SimpleCallCo } /*! - \qmlmethod object QtQuick2::Context2D::fillRect(real x, real y, real w, real h) + \qmlmethod object QtQuick::Context2D::fillRect(real x, real y, real w, real h) Stroke the specified rectangle's path using the strokeStyle, lineWidth, lineJoin, and (if appropriate) miterLimit attributes. @@ -2174,7 +2174,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeRect(QV4::SimpleCall // Complex shapes (paths) API /*! - \qmlmethod object QtQuick2::Context2D::arc(real x, real y, real radius, + \qmlmethod object QtQuick::Context2D::arc(real x, real y, real radius, real startAngle, real endAngle, bool anticlockwise) Adds an arc to the current subpath that lies on the circumference of the @@ -2223,7 +2223,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_arc(QV4::SimpleCallContext } /*! - \qmlmethod object QtQuick2::Context2D::arcTo(real x1, real y1, real x2, + \qmlmethod object QtQuick::Context2D::arcTo(real x1, real y1, real x2, real y2, real radius) Adds an arc with the given control points and radius to the current subpath, @@ -2269,7 +2269,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_arcTo(QV4::SimpleCallConte } /*! - \qmlmethod object QtQuick2::Context2D::beginPath() + \qmlmethod object QtQuick::Context2D::beginPath() Resets the current path to a new path. */ @@ -2286,7 +2286,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_beginPath(QV4::SimpleCallC } /*! - \qmlmethod object QtQuick2::Context2D::bezierCurveTo(real cp1x, real cp1y, real cp2x, real cp2y, real x, real y) + \qmlmethod object QtQuick::Context2D::bezierCurveTo(real cp1x, real cp1y, real cp2x, real cp2y, real x, real y) Adds a cubic bezier curve between the current position and the given endPoint using the control points specified by (\c cp1x, cp1y), and (\c cp2x, \c cp2y). @@ -2330,7 +2330,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_bezierCurveTo(QV4::SimpleC } /*! - \qmlmethod object QtQuick2::Context2D::clip() + \qmlmethod object QtQuick::Context2D::clip() Creates the clipping region from the current path. Any parts of the shape outside the clipping path are not displayed. @@ -2365,7 +2365,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_clip(QV4::SimpleCallContex } /*! - \qmlmethod object QtQuick2::Context2D::closePath() + \qmlmethod object QtQuick::Context2D::closePath() Closes the current subpath by drawing a line to the beginning of the subpath, automatically starting a new path. The current point of the new path is the previous subpath's first point. @@ -2385,7 +2385,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_closePath(QV4::SimpleCallC } /*! - \qmlmethod object QtQuick2::Context2D::fill() + \qmlmethod object QtQuick::Context2D::fill() Fills the subpaths with the current fill style. @@ -2404,7 +2404,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_fill(QV4::SimpleCallContex } /*! - \qmlmethod object QtQuick2::Context2D::lineTo(real x, real y) + \qmlmethod object QtQuick::Context2D::lineTo(real x, real y) Draws a line from the current position to the point (x, y). */ @@ -2429,7 +2429,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_lineTo(QV4::SimpleCallCont } /*! - \qmlmethod object QtQuick2::Context2D::moveTo(real x, real y) + \qmlmethod object QtQuick::Context2D::moveTo(real x, real y) Creates a new subpath with the given point. */ @@ -2451,7 +2451,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_moveTo(QV4::SimpleCallCont } /*! - \qmlmethod object QtQuick2::Context2D::quadraticCurveTo(real cpx, real cpy, real x, real y) + \qmlmethod object QtQuick::Context2D::quadraticCurveTo(real cpx, real cpy, real x, real y) Adds a quadratic bezier curve between the current point and the endpoint (\c x, \c y) with the control point specified by (\c cpx, \c cpy). @@ -2479,7 +2479,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_quadraticCurveTo(QV4::Simp } /*! - \qmlmethod object QtQuick2::Context2D::rect(real x, real y, real w, real h) + \qmlmethod object QtQuick::Context2D::rect(real x, real y, real w, real h) Adds a rectangle at position (\c x, \c y), with the given width \c w and height \c h, as a closed subpath. */ @@ -2495,7 +2495,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_rect(QV4::SimpleCallContex } /*! - \qmlmethod object QtQuick2::Context2D::roundedRect(real x, real y, real w, real h, real xRadius, real yRadius) + \qmlmethod object QtQuick::Context2D::roundedRect(real x, real y, real w, real h, real xRadius, real yRadius) Adds the given rectangle rect with rounded corners to the path. The \c xRadius and \c yRadius arguments specify the radius of the ellipses defining the corners of the rounded rectangle. @@ -2517,7 +2517,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_roundedRect(QV4::SimpleCal } /*! - \qmlmethod object QtQuick2::Context2D::ellipse(real x, real y, real w, real h) + \qmlmethod object QtQuick::Context2D::ellipse(real x, real y, real w, real h) Creates an ellipse within the bounding rectangle defined by its top-left corner at (\a x, \ y), width \a w and height \a h, and adds it to the path as a closed subpath. @@ -2538,7 +2538,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_ellipse(QV4::SimpleCallCon } /*! - \qmlmethod object QtQuick2::Context2D::text(string text, real x, real y) + \qmlmethod object QtQuick::Context2D::text(string text, real x, real y) Adds the given \c text to the path as a set of closed subpaths created from the current context font supplied. The subpaths are positioned so that the left end of the text's baseline lies at the point specified by (\c x, \c y). @@ -2561,7 +2561,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_text(QV4::SimpleCallContex } /*! - \qmlmethod object QtQuick2::Context2D::stroke() + \qmlmethod object QtQuick::Context2D::stroke() Strokes the subpaths with the current stroke style. @@ -2580,7 +2580,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_stroke(QV4::SimpleCallCont } /*! - \qmlmethod object QtQuick2::Context2D::isPointInPath(real x, real y) + \qmlmethod object QtQuick::Context2D::isPointInPath(real x, real y) Returns true if the given point is in the current path. @@ -2621,7 +2621,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_caretBlinkRate(QV4::Simple } /*! - \qmlproperty string QtQuick2::Context2D::font + \qmlproperty string QtQuick::Context2D::font Holds the current font settings. A subset of the @@ -2667,7 +2667,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_font(QV4::SimpleCallContext *ct } /*! - \qmlproperty string QtQuick2::Context2D::textAlign + \qmlproperty string QtQuick::Context2D::textAlign Holds the current text alignment settings. The possible values are: @@ -2732,7 +2732,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_textAlign(QV4::SimpleCallContex } /*! - \qmlproperty string QtQuick2::Context2D::textBaseline + \qmlproperty string QtQuick::Context2D::textBaseline Holds the current baseline alignment settings. The possible values are: @@ -2797,7 +2797,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_textBaseline(QV4::SimpleCallCon } /*! - \qmlmethod object QtQuick2::Context2D::fillText(text, x, y) + \qmlmethod object QtQuick::Context2D::fillText(text, x, y) Fills the given text at the given position. \sa font \sa textAlign @@ -2821,7 +2821,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillText(QV4::SimpleCallCo return ctx->callData->thisObject.asReturnedValue(); } /*! - \qmlmethod object QtQuick2::Context2D::strokeText(text, x, y) + \qmlmethod object QtQuick::Context2D::strokeText(text, x, y) Strokes the given text at the given position. \sa font \sa textAlign @@ -2846,7 +2846,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeText(QV4::SimpleCall \ingroup qtquick-canvas \brief Provides a Context2D TextMetrics interface - The TextMetrics object can be created by QtQuick2::Context2D::measureText method. + The TextMetrics object can be created by QtQuick::Context2D::measureText method. See \l{http://www.w3.org/TR/2dcontext/#textmetrics}{W3C 2d context TexMetrics} for more details. \sa Context2D::measureText @@ -2854,13 +2854,13 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeText(QV4::SimpleCall */ /*! - \qmlproperty int QtQuick2::TextMetrics::width - Holds the advance width of the text that was passed to the QtQuick2::Context2D::measureText() method. + \qmlproperty int QtQuick::TextMetrics::width + Holds the advance width of the text that was passed to the QtQuick::Context2D::measureText() method. This property is read only. */ /*! - \qmlmethod variant QtQuick2::Context2D::measureText(text) + \qmlmethod variant QtQuick::Context2D::measureText(text) Returns a TextMetrics object with the metrics of the given text in the current font. */ QV4::ReturnedValue QQuickJSContext2DPrototype::method_measureText(QV4::SimpleCallContext *ctx) @@ -2882,7 +2882,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_measureText(QV4::SimpleCal // drawing images /*! - \qmlmethod QtQuick2::Context2D::drawImage(variant image, real dx, real dy) + \qmlmethod QtQuick::Context2D::drawImage(variant image, real dx, real dy) Draws the given \a image on the canvas at position (\a dx, \a dy). Note: The \a image type can be an Image item, an image url or a CanvasImageData object. @@ -2899,7 +2899,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_measureText(QV4::SimpleCal \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-drawimage}{W3C 2d context standard for drawImage} */ /*! - \qmlmethod QtQuick2::Context2D::drawImage(variant image, real dx, real dy, real dw, real dh) + \qmlmethod QtQuick::Context2D::drawImage(variant image, real dx, real dy, real dw, real dh) This is an overloaded function. Draws the given item as \a image onto the canvas at point (\a dx, \a dy) and with width \a dw, height \a dh. @@ -2919,7 +2919,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_measureText(QV4::SimpleCal \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-drawimage}{W3C 2d context standard for drawImage} */ /*! - \qmlmethod QtQuick2::Context2D::drawImage(variant image, real sx, real sy, real sw, real sh, real dx, real dy, real dw, real dh) + \qmlmethod QtQuick::Context2D::drawImage(variant image, real sx, real sy, real sw, real sh, real dx, real dy, real dw, real dh) This is an overloaded function. Draws the given item as \a image from source point (\a sx, \a sy) and source width \a sw, source height \a sh onto the canvas at point (\a dx, \a dy) and with width \a dw, height \a dh. @@ -3072,7 +3072,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_drawImage(QV4::SimpleCallC \sa Context2D::putImageData() */ /*! - \qmlproperty int QtQuick2::CanvasImageData::width + \qmlproperty int QtQuick::CanvasImageData::width Holds the actual width dimension of the data in the ImageData object, in device pixels. */ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_width(QV4::SimpleCallContext *ctx) @@ -3088,7 +3088,7 @@ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_width(QV4::SimpleCallC } /*! - \qmlproperty int QtQuick2::CanvasImageData::height + \qmlproperty int QtQuick::CanvasImageData::height Holds the actual height dimension of the data in the ImageData object, in device pixels. */ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_height(QV4::SimpleCallContext *ctx) @@ -3104,7 +3104,7 @@ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_height(QV4::SimpleCall } /*! - \qmlproperty object QtQuick2::CanvasImageData::data + \qmlproperty object QtQuick::CanvasImageData::data Holds the one-dimensional array containing the data in RGBA order, as integers in the range 0 to 255. */ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_data(QV4::SimpleCallContext *ctx) @@ -3129,7 +3129,7 @@ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_data(QV4::SimpleCallCo */ /*! - \qmlproperty int QtQuick2::CanvasPixelArray::length + \qmlproperty int QtQuick::CanvasPixelArray::length The CanvasPixelArray object represents h×w×4 integers which w and h comes from CanvasImageData. The length attribute of a CanvasPixelArray object must return this h×w×4 number value. This property is read only. @@ -3209,25 +3209,25 @@ void QQuickJSContext2DPixelData::putIndexed(QV4::Managed *m, uint index, const Q } } /*! - \qmlmethod CanvasImageData QtQuick2::Context2D::createImageData(real sw, real sh) + \qmlmethod CanvasImageData QtQuick::Context2D::createImageData(real sw, real sh) Creates a CanvasImageData object with the given dimensions(\a sw, \a sh). */ /*! - \qmlmethod CanvasImageData QtQuick2::Context2D::createImageData(CanvasImageData imageData) + \qmlmethod CanvasImageData QtQuick::Context2D::createImageData(CanvasImageData imageData) Creates a CanvasImageData object with the same dimensions as the argument. */ /*! - \qmlmethod CanvasImageData QtQuick2::Context2D::createImageData(Url imageUrl) + \qmlmethod CanvasImageData QtQuick::Context2D::createImageData(Url imageUrl) Creates a CanvasImageData object with the given image loaded from \a imageUrl. \note The \a imageUrl must be already loaded before this function call, otherwise an empty CanvasImageData obect will be returned. - \sa Canvas::loadImage(), QtQuick2::Canvas::unloadImage(), - QtQuick2::Canvas::isImageLoaded + \sa Canvas::loadImage(), QtQuick::Canvas::unloadImage(), + QtQuick::Canvas::isImageLoaded */ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createImageData(QV4::SimpleCallContext *ctx) { @@ -3266,7 +3266,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createImageData(QV4::Simpl } /*! - \qmlmethod CanvasImageData QtQuick2::Context2D::getImageData(real sx, real sy, real sw, real sh) + \qmlmethod CanvasImageData QtQuick::Context2D::getImageData(real sx, real sy, real sw, real sh) Returns an CanvasImageData object containing the image data for the given rectangle of the canvas. */ QV4::ReturnedValue QQuickJSContext2DPrototype::method_getImageData(QV4::SimpleCallContext *ctx) @@ -3294,7 +3294,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_getImageData(QV4::SimpleCa } /*! - \qmlmethod object QtQuick2::Context2D::putImageData(CanvasImageData imageData, real dx, real dy, real dirtyX, real dirtyY, real dirtyWidth, real dirtyHeight) + \qmlmethod object QtQuick::Context2D::putImageData(CanvasImageData imageData, real dx, real dy, real dirtyX, real dirtyY, real dirtyWidth, real dirtyHeight) Paints the data from the given ImageData object onto the canvas. If a dirty rectangle (\a dirtyX, \a dirtyY, \a dirtyWidth, \a dirtyHeight) is provided, only the pixels from that rectangle are painted. */ QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(QV4::SimpleCallContext *ctx) @@ -3387,7 +3387,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(QV4::SimpleCa */ /*! - \qmlmethod CanvasGradient QtQuick2::CanvasGradient::addColorStop(real offsetof, string color) + \qmlmethod CanvasGradient QtQuick::CanvasGradient::addColorStop(real offsetof, string color) Adds a color stop with the given color to the gradient at the given offset. 0.0 is the offset at one end of the gradient, 1.0 is the offset at the other end. diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp index f1c71183f2..3c00a7d62d 100644 --- a/src/quick/items/qquickaccessibleattached.cpp +++ b/src/quick/items/qquickaccessibleattached.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty string QtQuick2::Accessible::name + \qmlproperty string QtQuick::Accessible::name This property sets an accessible name. For a button for example, this should have a binding to its text. @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty string QtQuick2::Accessible::description + \qmlproperty string QtQuick::Accessible::description This property sets an accessible description. Similar to the name it describes the item. The description @@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty enumeration QtQuick2::Accessible::role + \qmlproperty enumeration QtQuick::Accessible::role This flags sets the semantic type of the widget. A button for example would have "Button" as type. diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp index d8dbace0de..3f31884cd3 100644 --- a/src/quick/items/qquickanimatedimage.cpp +++ b/src/quick/items/qquickanimatedimage.cpp @@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty url QtQuick2::AnimatedImage::source + \qmlproperty url QtQuick::AnimatedImage::source This property holds the URL that refers to the source image. @@ -114,7 +114,7 @@ QQuickAnimatedImage::~QQuickAnimatedImage() } /*! - \qmlproperty bool QtQuick2::AnimatedImage::paused + \qmlproperty bool QtQuick::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 @@ -143,7 +143,7 @@ void QQuickAnimatedImage::setPaused(bool pause) } /*! - \qmlproperty bool QtQuick2::AnimatedImage::playing + \qmlproperty bool QtQuick::AnimatedImage::playing This property holds whether the animated image is playing. By default, this property is true, meaning that the animation @@ -185,8 +185,8 @@ void QQuickAnimatedImage::setPlaying(bool play) } /*! - \qmlproperty int QtQuick2::AnimatedImage::currentFrame - \qmlproperty int QtQuick2::AnimatedImage::frameCount + \qmlproperty int QtQuick::AnimatedImage::currentFrame + \qmlproperty int QtQuick::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/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp index a265fed820..3a32169447 100644 --- a/src/quick/items/qquickanimatedsprite.cpp +++ b/src/quick/items/qquickanimatedsprite.cpp @@ -225,7 +225,7 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty bool QtQuick2::AnimatedSprite::running + \qmlproperty bool QtQuick::AnimatedSprite::running Whether the sprite is animating or not. @@ -233,7 +233,7 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty bool QtQuick2::AnimatedSprite::interpolate + \qmlproperty bool QtQuick::AnimatedSprite::interpolate If true, interpolation will occur between sprite frames to make the animation appear smoother. @@ -242,7 +242,7 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty qreal QtQuick2::AnimatedSprite::frameRate + \qmlproperty qreal QtQuick::AnimatedSprite::frameRate Frames per second to show in the animation. Values equal to or below 0 are invalid. @@ -253,7 +253,7 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty int QtQuick2::AnimatedSprite::frameDuration + \qmlproperty int QtQuick::AnimatedSprite::frameDuration Duration of each frame of the animation. Values equal to or below 0 are invalid. @@ -264,40 +264,40 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty int QtQuick2::AnimatedSprite::frameCount + \qmlproperty int QtQuick::AnimatedSprite::frameCount Number of frames in this AnimatedSprite. */ /*! - \qmlproperty int QtQuick2::AnimatedSprite::frameHeight + \qmlproperty int QtQuick::AnimatedSprite::frameHeight Height of a single frame in this AnimatedSprite. May be omitted if it is the only sprite in the file. */ /*! - \qmlproperty int QtQuick2::AnimatedSprite::frameWidth + \qmlproperty int QtQuick::AnimatedSprite::frameWidth Width of a single frame in this AnimatedSprite. May be omitted if it is the only sprite in the file. */ /*! - \qmlproperty int QtQuick2::AnimatedSprite::frameX + \qmlproperty int QtQuick::AnimatedSprite::frameX The X coordinate in the image file of the first frame of the AnimatedSprite. May be omitted if the first frame starts in the upper left corner of the file. */ /*! - \qmlproperty int QtQuick2::AnimatedSprite::frameY + \qmlproperty int QtQuick::AnimatedSprite::frameY The Y coordinate in the image file of the first frame of the AnimatedSprite. May be omitted if the first frame starts in the upper left corner of the file. */ /*! - \qmlproperty url QtQuick2::AnimatedSprite::source + \qmlproperty url QtQuick::AnimatedSprite::source The image source for the animation. @@ -308,7 +308,7 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty bool QtQuick2::AnimatedSprite::reverse + \qmlproperty bool QtQuick::AnimatedSprite::reverse If true, then the animation will be played in reverse. @@ -316,7 +316,7 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty bool QtQuick2::AnimatedSprite::frameSync + \qmlproperty bool QtQuick::AnimatedSprite::frameSync If true, then the animation will have no duration. Instead, the animation will advance one frame each time a frame is rendered to the screen. This synchronizes it with the painting @@ -330,7 +330,7 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty int QtQuick2::AnimatedSprite::loops + \qmlproperty int QtQuick::AnimatedSprite::loops After playing the animation this many times, the animation will automatically stop. Negative values are invalid. @@ -340,7 +340,7 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty bool QtQuick2::AnimatedSprite::paused + \qmlproperty bool QtQuick::AnimatedSprite::paused When paused, the current frame can be advanced manually. @@ -348,14 +348,14 @@ struct AnimatedSpriteVertices { */ /*! - \qmlproperty int QtQuick2::AnimatedSprite::currentFrame + \qmlproperty int QtQuick::AnimatedSprite::currentFrame When paused, the current frame can be advanced manually by setting this property or calling advance(). */ /*! - \qmlmethod int QtQuick2::AnimatedSprite::restart() + \qmlmethod int QtQuick::AnimatedSprite::restart() Stops, then starts the sprite animation. */ @@ -430,7 +430,7 @@ void QQuickAnimatedSprite::stop() } /*! - \qmlmethod int QtQuick2::AnimatedSprite::advance() + \qmlmethod int QtQuick::AnimatedSprite::advance() Advances the sprite animation by one frame. */ @@ -447,7 +447,7 @@ void QQuickAnimatedSprite::advance(int frames) } /*! - \qmlmethod int QtQuick2::AnimatedSprite::pause() + \qmlmethod int QtQuick::AnimatedSprite::pause() Pauses the sprite animation. This does nothing if \l paused is true. @@ -464,7 +464,7 @@ void QQuickAnimatedSprite::pause() } /*! - \qmlmethod int QtQuick2::AnimatedSprite::resume() + \qmlmethod int QtQuick::AnimatedSprite::resume() Resumes the sprite animation if \l paused is true; otherwise, this does nothing. diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index 22a38f370a..3cbcf1937f 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -150,7 +150,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool QtQuick2::BorderImage::asynchronous + \qmlproperty bool QtQuick::BorderImage::asynchronous Specifies that images on the local filesystem should be loaded asynchronously in a separate thread. The default value is @@ -176,7 +176,7 @@ QQuickBorderImage::~QQuickBorderImage() } /*! - \qmlproperty enumeration QtQuick2::BorderImage::status + \qmlproperty enumeration QtQuick::BorderImage::status This property describes the status of image loading. It can be one of: @@ -191,7 +191,7 @@ QQuickBorderImage::~QQuickBorderImage() */ /*! - \qmlproperty real QtQuick2::BorderImage::progress + \qmlproperty real QtQuick::BorderImage::progress This property holds the progress of image loading, from 0.0 (nothing loaded) to 1.0 (finished). @@ -200,7 +200,7 @@ QQuickBorderImage::~QQuickBorderImage() */ /*! - \qmlproperty bool QtQuick2::BorderImage::smooth + \qmlproperty bool QtQuick::BorderImage::smooth This property holds whether the image is smoothly filtered when scaled or transformed. Smooth filtering gives better visual quality, but it may be slower @@ -211,7 +211,7 @@ QQuickBorderImage::~QQuickBorderImage() */ /*! - \qmlproperty bool QtQuick2::BorderImage::cache + \qmlproperty bool QtQuick::BorderImage::cache Specifies whether the image should be cached. The default value is true. Setting \a cache to false is useful when dealing with large images, @@ -219,7 +219,7 @@ QQuickBorderImage::~QQuickBorderImage() */ /*! - \qmlproperty bool QtQuick2::BorderImage::mirror + \qmlproperty bool QtQuick::BorderImage::mirror This property holds whether the image should be horizontally inverted (effectively displaying a mirrored image). @@ -228,7 +228,7 @@ QQuickBorderImage::~QQuickBorderImage() */ /*! - \qmlproperty url QtQuick2::BorderImage::source + \qmlproperty url QtQuick::BorderImage::source This property holds the URL that refers to the source image. @@ -256,7 +256,7 @@ QQuickBorderImage::~QQuickBorderImage() */ /*! - \qmlproperty QSize QtQuick2::BorderImage::sourceSize + \qmlproperty QSize QtQuick::BorderImage::sourceSize This property holds the actual width and height of the loaded image. @@ -350,10 +350,10 @@ void QQuickBorderImage::load() } /*! - \qmlproperty int QtQuick2::BorderImage::border.left - \qmlproperty int QtQuick2::BorderImage::border.right - \qmlproperty int QtQuick2::BorderImage::border.top - \qmlproperty int QtQuick2::BorderImage::border.bottom + \qmlproperty int QtQuick::BorderImage::border.left + \qmlproperty int QtQuick::BorderImage::border.right + \qmlproperty int QtQuick::BorderImage::border.top + \qmlproperty int QtQuick::BorderImage::border.bottom The 4 border lines (2 horizontal and 2 vertical) break the image into 9 sections, as shown below: @@ -385,8 +385,8 @@ QQuickScaleGrid *QQuickBorderImage::border() } /*! - \qmlproperty enumeration QtQuick2::BorderImage::horizontalTileMode - \qmlproperty enumeration QtQuick2::BorderImage::verticalTileMode + \qmlproperty enumeration QtQuick::BorderImage::horizontalTileMode + \qmlproperty enumeration QtQuick::BorderImage::verticalTileMode This property describes how to repeat or stretch the middle parts of the border image. diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp index 4973e2dc8d..ea130968ca 100644 --- a/src/quick/items/qquickdrag.cpp +++ b/src/quick/items/qquickdrag.cpp @@ -274,7 +274,7 @@ QQuickDragAttached::~QQuickDragAttached() } /*! - \qmlattachedproperty bool QtQuick2::Drag::active + \qmlattachedproperty bool QtQuick::Drag::active This property holds whether a drag event sequence is currently active. @@ -319,7 +319,7 @@ void QQuickDragAttached::setActive(bool active) } /*! - \qmlattachedproperty Object QtQuick2::Drag::source + \qmlattachedproperty Object QtQuick::Drag::source This property holds an object that is identified to recipients of drag events as the source of the events. By default this is the item Drag property is attached to. @@ -357,7 +357,7 @@ void QQuickDragAttached::resetSource() } /*! - \qmlattachedproperty Object QtQuick2::Drag::target + \qmlattachedproperty Object QtQuick::Drag::target While a drag is active this property holds the last object to accept an enter event from the dragged item, if the current drag position doesn't @@ -375,7 +375,7 @@ QObject *QQuickDragAttached::target() const } /*! - \qmlattachedproperty QPointF QtQuick2::Drag::hotSpot + \qmlattachedproperty QPointF QtQuick::Drag::hotSpot This property holds the drag position relative to the top left of the item. @@ -404,7 +404,7 @@ void QQuickDragAttached::setHotSpot(const QPointF &hotSpot) } /*! - \qmlattachedproperty stringlist QtQuick2::Drag::keys + \qmlattachedproperty stringlist QtQuick::Drag::keys This property holds a list of keys that can be used by a DropArea to filter drag events. @@ -430,7 +430,7 @@ void QQuickDragAttached::setKeys(const QStringList &keys) } /*! - \qmlattachedproperty stringlist QtQuick2::Drag::mimeData + \qmlattachedproperty stringlist QtQuick::Drag::mimeData \since 5.2 This property holds a map of mimeData that is used during startDrag. @@ -452,7 +452,7 @@ void QQuickDragAttached::setMimeData(const QVariantMap &mimeData) } /*! - \qmlattachedproperty flags QtQuick2::Drag::supportedActions + \qmlattachedproperty flags QtQuick::Drag::supportedActions This property holds return values of Drag.drop() supported by the drag source. @@ -478,7 +478,7 @@ void QQuickDragAttached::setSupportedActions(Qt::DropActions actions) } /*! - \qmlattachedproperty enumeration QtQuick2::Drag::proposedAction + \qmlattachedproperty enumeration QtQuick::Drag::proposedAction This property holds an action that is recommended by the drag source as a return value from Drag.drop(). @@ -507,7 +507,7 @@ void QQuickDragAttached::setProposedAction(Qt::DropAction action) } /*! - \qmlattachedproperty enumeration QtQuick2::Drag::dragType + \qmlattachedproperty enumeration QtQuick::Drag::dragType \since 5.2 This property indicates whether to automatically start drags, do nothing, or @@ -571,7 +571,7 @@ void QQuickDragAttachedPrivate::start(Qt::DropActions supportedActions) } /*! - \qmlattachedmethod void QtQuick2::Drag::start(flags supportedActions) + \qmlattachedmethod void QtQuick::Drag::start(flags supportedActions) Starts sending drag events. Used for starting old-style internal drags. \l startDrag is the new-style, preferred method of starting drags. @@ -607,7 +607,7 @@ void QQuickDragAttached::start(QQmlV4Function *args) } /*! - \qmlattachedmethod enumeration QtQuick2::Drag::drop() + \qmlattachedmethod enumeration QtQuick::Drag::drop() Ends a drag sequence by sending a drop event to the target item. @@ -668,7 +668,7 @@ int QQuickDragAttached::drop() } /*! - \qmlattachedmethod void QtQuick2::Drag::cancel() + \qmlattachedmethod void QtQuick::Drag::cancel() Ends a drag sequence. */ @@ -696,14 +696,14 @@ void QQuickDragAttached::cancel() } /*! - \qmlsignal QtQuick2::DropArea::onDragStarted() + \qmlsignal QtQuick::DropArea::onDragStarted() This handler is called when a drag is started with the \l startDrag method or when it is started automatically using the \l dragType property. */ /*! - \qmlsignal QtQuick2::DropArea::onDragFinished(DropAction action) + \qmlsignal QtQuick::DropArea::onDragFinished(DropAction action) This handler is called when a drag finishes and the drag was started with the \l startDrag method or started automatically using the \l dragType property. @@ -748,7 +748,7 @@ Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedAct /*! - \qmlattachedmethod void QtQuick2::Drag::startDrag(flags supportedActions) + \qmlattachedmethod void QtQuick::Drag::startDrag(flags supportedActions) Starts sending drag events. diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp index f3acec71f0..405e8f8c90 100644 --- a/src/quick/items/qquickdroparea.cpp +++ b/src/quick/items/qquickdroparea.cpp @@ -125,7 +125,7 @@ QQuickDropArea::~QQuickDropArea() } /*! - \qmlproperty bool QtQuick2::DropArea::containsDrag + \qmlproperty bool QtQuick::DropArea::containsDrag This property identifies whether the DropArea currently contains any dragged items. @@ -138,14 +138,14 @@ bool QQuickDropArea::containsDrag() const } /*! - \qmlproperty stringlist QtQuick2::DropArea::keys + \qmlproperty stringlist QtQuick::DropArea::keys This property holds a list of drag keys a DropArea will accept. If no keys are listed the DropArea will accept events from any drag source, otherwise the drag source must have at least one compatible key. - \sa QtQuick2::Drag::keys + \sa QtQuick::Drag::keys */ QStringList QQuickDropArea::keys() const @@ -182,7 +182,7 @@ QQuickDropAreaDrag *QQuickDropArea::drag() } /*! - \qmlproperty Object QtQuick2::DropArea::drag.source + \qmlproperty Object QtQuick::DropArea::drag.source This property holds the source of a drag. */ @@ -193,8 +193,8 @@ QObject *QQuickDropAreaDrag::source() const } /*! - \qmlproperty qreal QtQuick2::DropArea::drag.x - \qmlproperty qreal QtQuick2::DropArea::drag.y + \qmlproperty qreal QtQuick::DropArea::drag.x + \qmlproperty qreal QtQuick::DropArea::drag.y These properties hold the coordinates of the last drag event. */ @@ -210,7 +210,7 @@ qreal QQuickDropAreaDrag::y() const } /*! - \qmlsignal QtQuick2::DropArea::onPositionChanged(DragEvent drag) + \qmlsignal QtQuick::DropArea::onPositionChanged(DragEvent drag) This handler is called when the position of a drag has changed. */ @@ -251,7 +251,7 @@ QStringList QQuickDropAreaPrivate::getKeys(const QMimeData *mimeData) const } /*! - \qmlsignal QtQuick2::DropArea::onEntered(DragEvent drag) + \qmlsignal QtQuick::DropArea::onEntered(DragEvent drag) This handler is called when a \a drag enters the bounds of a DropArea. */ @@ -284,7 +284,7 @@ void QQuickDropArea::dragEnterEvent(QDragEnterEvent *event) } /*! - \qmlsignal QtQuick2::DropArea::onExited() + \qmlsignal QtQuick::DropArea::onExited() This handler is called when a drag exits the bounds of a DropArea. */ @@ -305,7 +305,7 @@ void QQuickDropArea::dragLeaveEvent(QDragLeaveEvent *) } /*! - \qmlsignal QtQuick2::DropArea::onDropped(DragEvent drop) + \qmlsignal QtQuick::DropArea::onDropped(DragEvent drop) This handler is called when a drop event occurs within the bounds of a a DropArea. @@ -350,32 +350,32 @@ void QQuickDropArea::dropEvent(QDropEvent *event) */ /*! - \qmlproperty real QtQuick2::DragEvent::x + \qmlproperty real QtQuick::DragEvent::x This property holds the x coordinate of a drag event. */ /*! - \qmlproperty real QtQuick2::DragEvent::y + \qmlproperty real QtQuick::DragEvent::y This property holds the y coordinate of a drag event. */ /*! - \qmlproperty Object QtQuick2::DragEvent::drag.source + \qmlproperty Object QtQuick::DragEvent::drag.source This property holds the source of a drag event. */ /*! - \qmlproperty stringlist QtQuick2::DragEvent::keys + \qmlproperty stringlist QtQuick::DragEvent::keys This property holds a list of keys identifying the data type or source of a drag event. */ /*! - \qmlproperty enumeration QtQuick2::DragEvent::action + \qmlproperty enumeration QtQuick::DragEvent::action This property holds the action that the \l source is to perform on an accepted drop. @@ -390,14 +390,14 @@ void QQuickDropArea::dropEvent(QDropEvent *event) */ /*! - \qmlproperty flags QtQuick2::DragEvent::supportedActions + \qmlproperty flags QtQuick::DragEvent::supportedActions This property holds the set of \l {action}{actions} supported by the drag source. */ /*! - \qmlproperty flags QtQuick2::DragEvent::proposedAction + \qmlproperty flags QtQuick::DragEvent::proposedAction \since 5.2 This property holds the set of \l {action}{actions} proposed by the @@ -405,7 +405,7 @@ void QQuickDropArea::dropEvent(QDropEvent *event) */ /*! - \qmlproperty bool QtQuick2::DragEvent::accepted + \qmlproperty bool QtQuick::DragEvent::accepted This property holds whether the drag event was accepted by a handler. @@ -413,8 +413,8 @@ void QQuickDropArea::dropEvent(QDropEvent *event) */ /*! - \qmlmethod QtQuick2::DragEvent::accept() - \qmlmethod QtQuick2::DragEvent::accept(enumeration action) + \qmlmethod QtQuick::DragEvent::accept() + \qmlmethod QtQuick::DragEvent::accept(enumeration action) Accepts the drag event. @@ -422,77 +422,77 @@ void QQuickDropArea::dropEvent(QDropEvent *event) */ /*! - \qmlmethod QtQuick2::DragEvent::acceptProposedAction() + \qmlmethod QtQuick::DragEvent::acceptProposedAction() \since 5.2 Accepts the drag event with the \l proposedAction. */ /*! - \qmlproperty bool QtQuick2::DragEvent::hasColor + \qmlproperty bool QtQuick::DragEvent::hasColor \since 5.2 This property holds whether the drag event contains a color item. */ /*! - \qmlproperty bool QtQuick2::DragEvent::hasHtml + \qmlproperty bool QtQuick::DragEvent::hasHtml \since 5.2 This property holds whether the drag event contains a html item. */ /*! - \qmlproperty bool QtQuick2::DragEvent::hasText + \qmlproperty bool QtQuick::DragEvent::hasText \since 5.2 This property holds whether the drag event contains a text item. */ /*! - \qmlproperty bool QtQuick2::DragEvent::hasUrls + \qmlproperty bool QtQuick::DragEvent::hasUrls \since 5.2 This property holds whether the drag event contains one or more url items. */ /*! - \qmlproperty color QtQuick2::DragEvent::colorData + \qmlproperty color QtQuick::DragEvent::colorData \since 5.2 This property holds color data, if any. */ /*! - \qmlproperty string QtQuick2::DragEvent::html + \qmlproperty string QtQuick::DragEvent::html \since 5.2 This property holds html data, if any. */ /*! - \qmlproperty string QtQuick2::DragEvent::text + \qmlproperty string QtQuick::DragEvent::text \since 5.2 This property holds text data, if any. */ /*! - \qmlproperty urllist QtQuick2::DragEvent::urls + \qmlproperty urllist QtQuick::DragEvent::urls \since 5.2 This property holds a list of urls, if any. */ /*! - \qmlproperty stringlist QtQuick2::DragEvent::formats + \qmlproperty stringlist QtQuick::DragEvent::formats \since 5.2 This property holds a list of mime type formats contained in the drag data. */ /*! - \qmlmethod string QtQuick2::DragEvent::getDataAsString(string format) + \qmlmethod string QtQuick::DragEvent::getDataAsString(string format) \since 5.2 Returns the data for the given \a format converted to a string. \a format should be one contained in the \l formats property. diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index da3cb23265..b04f912e13 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -62,7 +62,7 @@ Item { */ /*! - \qmlproperty int QtQuick2::KeyEvent::key + \qmlproperty int QtQuick::KeyEvent::key This property holds the code of the key that was pressed or released. @@ -79,7 +79,7 @@ Item { */ /*! - \qmlproperty string QtQuick2::KeyEvent::text + \qmlproperty string QtQuick::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,13 +88,13 @@ Item { */ /*! - \qmlproperty bool QtQuick2::KeyEvent::isAutoRepeat + \qmlproperty bool QtQuick::KeyEvent::isAutoRepeat This property holds whether this event comes from an auto-repeating key. */ /*! - \qmlproperty quint32 QtQuick2::KeyEvent::nativeScanCode + \qmlproperty quint32 QtQuick::KeyEvent::nativeScanCode This property contains the native scan code of the key that was pressed. It is passed through from QKeyEvent unchanged. @@ -103,14 +103,14 @@ Item { */ /*! - \qmlproperty int QtQuick2::KeyEvent::count + \qmlproperty int QtQuick::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 QtQuick2::KeyEvent::accepted + \qmlproperty bool QtQuick::KeyEvent::accepted Setting \a accepted to true prevents the key event from being propagated to the item's parent. @@ -120,7 +120,7 @@ Item { */ /*! - \qmlproperty int QtQuick2::KeyEvent::modifiers + \qmlproperty int QtQuick::KeyEvent::modifiers This property holds the keyboard modifier flags that existed immediately before the event occurred. @@ -148,7 +148,7 @@ Item { */ /*! - \qmlmethod bool QtQuick2::KeyEvent::matches(StandardKey key) + \qmlmethod bool QtQuick::KeyEvent::matches(StandardKey key) \since 5.2 Returns \c true if the key event matches the given standard \a key; otherwise returns \c false. @@ -188,15 +188,15 @@ Item { */ /*! - \qmlproperty int QtQuick2::MouseEvent::x - \qmlproperty int QtQuick2::MouseEvent::y + \qmlproperty int QtQuick::MouseEvent::x + \qmlproperty int QtQuick::MouseEvent::y These properties hold the coordinates of the position supplied by the mouse event. */ /*! - \qmlproperty bool QtQuick2::MouseEvent::accepted + \qmlproperty bool QtQuick::MouseEvent::accepted Setting \a accepted to true prevents the mouse event from being propagated to items below this item. @@ -206,7 +206,7 @@ Item { */ /*! - \qmlproperty enumeration QtQuick2::MouseEvent::button + \qmlproperty enumeration QtQuick::MouseEvent::button This property holds the button that caused the event. It can be one of: \list @@ -217,14 +217,14 @@ Item { */ /*! - \qmlproperty bool QtQuick2::MouseEvent::wasHeld + \qmlproperty bool QtQuick::MouseEvent::wasHeld This property is true if the mouse button has been held pressed longer the threshold (800ms). */ /*! - \qmlproperty int QtQuick2::MouseEvent::buttons + \qmlproperty int QtQuick::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 @@ -240,7 +240,7 @@ Item { */ /*! - \qmlproperty int QtQuick2::MouseEvent::modifiers + \qmlproperty int QtQuick::MouseEvent::modifiers This property holds the keyboard modifier flags that existed immediately before the event occurred. @@ -285,14 +285,14 @@ Item { */ /*! - \qmlproperty int QtQuick2::WheelEvent::x - \qmlproperty int QtQuick2::WheelEvent::y + \qmlproperty int QtQuick::WheelEvent::x + \qmlproperty int QtQuick::WheelEvent::y These properties hold the coordinates of the position supplied by the wheel event. */ /*! - \qmlproperty bool QtQuick2::WheelEvent::accepted + \qmlproperty bool QtQuick::WheelEvent::accepted Setting \a accepted to true prevents the wheel event from being propagated to items below this item. @@ -302,7 +302,7 @@ Item { */ /*! - \qmlproperty int QtQuick2::WheelEvent::buttons + \qmlproperty int QtQuick::WheelEvent::buttons This property holds the mouse buttons pressed when the wheel event was generated. @@ -315,7 +315,7 @@ Item { */ /*! - \qmlproperty point QtQuick2::WheelEvent::angleDelta + \qmlproperty point QtQuick::WheelEvent::angleDelta This property holds the distance that the wheel is rotated in wheel degrees. The x and y cordinate of this property holds the delta in horizontal and @@ -329,7 +329,7 @@ Item { */ /*! - \qmlproperty point QtQuick2::WheelEvent::pixelDelta + \qmlproperty point QtQuick::WheelEvent::pixelDelta This property holds the delta in screen pixels and is available in plataforms that have high-resolution trackpads, such as Mac OS X. @@ -341,7 +341,7 @@ Item { */ /*! - \qmlproperty int QtQuick2::WheelEvent::modifiers + \qmlproperty int QtQuick::WheelEvent::modifiers This property holds the keyboard modifier flags that existed immediately before the event occurred. diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 037e4786c2..d1caa824e7 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -581,14 +581,14 @@ is finished. */ /*! - \qmlsignal QtQuick2::Flickable::onDragStarted() + \qmlsignal QtQuick::Flickable::onDragStarted() This handler is called when the view starts to be dragged due to user interaction. */ /*! - \qmlsignal QtQuick2::Flickable::onDragEnded() + \qmlsignal QtQuick::Flickable::onDragEnded() This handler is called when the user stops dragging the view. @@ -648,14 +648,14 @@ is finished. */ /*! - \qmlsignal QtQuick2::Flickable::onMovementStarted() + \qmlsignal QtQuick::Flickable::onMovementStarted() This handler is called when the view begins moving due to user interaction. */ /*! - \qmlsignal QtQuick2::Flickable::onMovementEnded() + \qmlsignal QtQuick::Flickable::onMovementEnded() This handler is called when the view stops moving due to user interaction. If a flick was generated, this handler will @@ -665,7 +665,7 @@ is finished. */ /*! - \qmlsignal QtQuick2::Flickable::onFlickStarted() + \qmlsignal QtQuick::Flickable::onFlickStarted() This handler is called when the view is flicked. A flick starts from the point that the mouse or touch is released, @@ -673,16 +673,16 @@ is finished. */ /*! - \qmlsignal QtQuick2::Flickable::onFlickEnded() + \qmlsignal QtQuick::Flickable::onFlickEnded() This handler is called when the view stops moving due to a flick. */ /*! - \qmlproperty real QtQuick2::Flickable::visibleArea.xPosition - \qmlproperty real QtQuick2::Flickable::visibleArea.widthRatio - \qmlproperty real QtQuick2::Flickable::visibleArea.yPosition - \qmlproperty real QtQuick2::Flickable::visibleArea.heightRatio + \qmlproperty real QtQuick::Flickable::visibleArea.xPosition + \qmlproperty real QtQuick::Flickable::visibleArea.widthRatio + \qmlproperty real QtQuick::Flickable::visibleArea.yPosition + \qmlproperty real QtQuick::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, @@ -718,8 +718,8 @@ QQuickFlickable::~QQuickFlickable() } /*! - \qmlproperty real QtQuick2::Flickable::contentX - \qmlproperty real QtQuick2::Flickable::contentY + \qmlproperty real QtQuick::Flickable::contentX + \qmlproperty real QtQuick::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, @@ -760,7 +760,7 @@ void QQuickFlickable::setContentY(qreal pos) } /*! - \qmlproperty bool QtQuick2::Flickable::interactive + \qmlproperty bool QtQuick::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. @@ -798,8 +798,8 @@ void QQuickFlickable::setInteractive(bool interactive) } /*! - \qmlproperty real QtQuick2::Flickable::horizontalVelocity - \qmlproperty real QtQuick2::Flickable::verticalVelocity + \qmlproperty real QtQuick::Flickable::horizontalVelocity + \qmlproperty real QtQuick::Flickable::verticalVelocity The instantaneous velocity of movement along the x and y axes, in pixels/sec. @@ -823,10 +823,10 @@ qreal QQuickFlickable::verticalVelocity() const } /*! - \qmlproperty bool QtQuick2::Flickable::atXBeginning - \qmlproperty bool QtQuick2::Flickable::atXEnd - \qmlproperty bool QtQuick2::Flickable::atYBeginning - \qmlproperty bool QtQuick2::Flickable::atYEnd + \qmlproperty bool QtQuick::Flickable::atXBeginning + \qmlproperty bool QtQuick::Flickable::atXEnd + \qmlproperty bool QtQuick::Flickable::atYBeginning + \qmlproperty bool QtQuick::Flickable::atYEnd These properties are true if the flickable view is positioned at the beginning, or end respectively. @@ -856,7 +856,7 @@ bool QQuickFlickable::isAtYBeginning() const } /*! - \qmlproperty Item QtQuick2::Flickable::contentItem + \qmlproperty Item QtQuick::Flickable::contentItem The internal item that contains the Items to be moved in the Flickable. @@ -890,7 +890,7 @@ QQuickFlickableVisibleArea *QQuickFlickable::visibleArea() } /*! - \qmlproperty enumeration QtQuick2::Flickable::flickableDirection + \qmlproperty enumeration QtQuick::Flickable::flickableDirection This property determines which directions the view can be flicked. @@ -920,7 +920,7 @@ void QQuickFlickable::setFlickableDirection(FlickableDirection direction) } /*! - \qmlproperty bool QtQuick2::Flickable::pixelAligned + \qmlproperty bool QtQuick::Flickable::pixelAligned This property sets the alignment of \l contentX and \l contentY to pixels (\c true) or subpixels (\c false). @@ -1551,7 +1551,7 @@ void QQuickFlickable::geometryChanged(const QRectF &newGeometry, } /*! - \qmlmethod QtQuick2::Flickable::flick(qreal xVelocity, qreal yVelocity) + \qmlmethod QtQuick::Flickable::flick(qreal xVelocity, qreal yVelocity) Flicks the content with \a xVelocity horizontally and \a yVelocity vertically in pixels/sec. */ @@ -1586,7 +1586,7 @@ void QQuickFlickablePrivate::flickingStarted(bool flickingH, bool flickingV) } /*! - \qmlmethod QtQuick2::Flickable::cancelFlick() + \qmlmethod QtQuick::Flickable::cancelFlick() Cancels the current flick animation. */ @@ -1641,7 +1641,7 @@ QQmlListProperty<QQuickItem> QQuickFlickable::flickableChildren() } /*! - \qmlproperty enumeration QtQuick2::Flickable::boundsBehavior + \qmlproperty enumeration QtQuick::Flickable::boundsBehavior This property holds whether the surface may be dragged beyond the Flickable's boundaries, or overshoot the Flickable's boundaries when flicked. @@ -1677,7 +1677,7 @@ void QQuickFlickable::setBoundsBehavior(BoundsBehavior b) } /*! - \qmlproperty Transition QtQuick2::Flickable::rebound + \qmlproperty Transition QtQuick::Flickable::rebound This holds the transition to be applied to the content view when it snaps back to the bounds of the flickable. The transition is @@ -1738,8 +1738,8 @@ void QQuickFlickable::setRebound(QQuickTransition *transition) } /*! - \qmlproperty real QtQuick2::Flickable::contentWidth - \qmlproperty real QtQuick2::Flickable::contentHeight + \qmlproperty real QtQuick::Flickable::contentWidth + \qmlproperty real QtQuick::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 @@ -1820,10 +1820,10 @@ void QQuickFlickable::setContentHeight(qreal h) } /*! - \qmlproperty real QtQuick2::Flickable::topMargin - \qmlproperty real QtQuick2::Flickable::leftMargin - \qmlproperty real QtQuick2::Flickable::bottomMargin - \qmlproperty real QtQuick2::Flickable::rightMargin + \qmlproperty real QtQuick::Flickable::topMargin + \qmlproperty real QtQuick::Flickable::leftMargin + \qmlproperty real QtQuick::Flickable::bottomMargin + \qmlproperty real QtQuick::Flickable::rightMargin These properties hold the margins around the content. This space is reserved in addition to the contentWidth and contentHeight. @@ -1915,8 +1915,8 @@ void QQuickFlickable::setRightMargin(qreal m) } /*! - \qmlproperty real QtQuick2::Flickable::originX - \qmlproperty real QtQuick2::Flickable::originY + \qmlproperty real QtQuick::Flickable::originX + \qmlproperty real QtQuick::Flickable::originY These properties hold the origin of the content. This value always refers to the top-left position of the content regardless of layout direction. @@ -1940,7 +1940,7 @@ qreal QQuickFlickable::originX() const /*! - \qmlmethod QtQuick2::Flickable::resizeContent(real width, real height, QPointF center) + \qmlmethod QtQuick::Flickable::resizeContent(real width, real height, QPointF center) Resizes the content to \a width x \a height about \a center. @@ -1978,7 +1978,7 @@ void QQuickFlickable::resizeContent(qreal w, qreal h, QPointF center) } /*! - \qmlmethod QtQuick2::Flickable::returnToBounds() + \qmlmethod QtQuick::Flickable::returnToBounds() Ensures the content is within legal bounds. @@ -2132,7 +2132,7 @@ bool QQuickFlickable::childMouseEventFilter(QQuickItem *i, QEvent *e) } /*! - \qmlproperty real QtQuick2::Flickable::maximumFlickVelocity + \qmlproperty real QtQuick::Flickable::maximumFlickVelocity This property holds the maximum velocity that the user can flick the view in pixels/second. The default value is platform dependent. @@ -2153,7 +2153,7 @@ void QQuickFlickable::setMaximumFlickVelocity(qreal v) } /*! - \qmlproperty real QtQuick2::Flickable::flickDeceleration + \qmlproperty real QtQuick::Flickable::flickDeceleration This property holds the rate at which a flick will decelerate. The default value is platform dependent. @@ -2180,9 +2180,9 @@ bool QQuickFlickable::isFlicking() const } /*! - \qmlproperty bool QtQuick2::Flickable::flicking - \qmlproperty bool QtQuick2::Flickable::flickingHorizontally - \qmlproperty bool QtQuick2::Flickable::flickingVertically + \qmlproperty bool QtQuick::Flickable::flicking + \qmlproperty bool QtQuick::Flickable::flickingHorizontally + \qmlproperty bool QtQuick::Flickable::flickingVertically These properties describe whether the view is currently moving horizontally, vertically or in either direction, due to the user flicking the view. @@ -2200,9 +2200,9 @@ bool QQuickFlickable::isFlickingVertically() const } /*! - \qmlproperty bool QtQuick2::Flickable::dragging - \qmlproperty bool QtQuick2::Flickable::draggingHorizontally - \qmlproperty bool QtQuick2::Flickable::draggingVertically + \qmlproperty bool QtQuick::Flickable::dragging + \qmlproperty bool QtQuick::Flickable::draggingHorizontally + \qmlproperty bool QtQuick::Flickable::draggingVertically These properties describe whether the view is currently moving horizontally, vertically or in either direction, due to the user dragging the view. @@ -2272,7 +2272,7 @@ bool QQuickFlickablePrivate::isViewMoving() const } /*! - \qmlproperty int QtQuick2::Flickable::pressDelay + \qmlproperty int QtQuick::Flickable::pressDelay This property holds the time to delay (ms) delivering a press to children of the Flickable. This can be useful where reacting @@ -2305,9 +2305,9 @@ void QQuickFlickable::setPressDelay(int delay) } /*! - \qmlproperty bool QtQuick2::Flickable::moving - \qmlproperty bool QtQuick2::Flickable::movingHorizontally - \qmlproperty bool QtQuick2::Flickable::movingVertically + \qmlproperty bool QtQuick::Flickable::moving + \qmlproperty bool QtQuick::Flickable::movingHorizontally + \qmlproperty bool QtQuick::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/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp index 1be5cf473a..15ebf776aa 100644 --- a/src/quick/items/qquickflipable.cpp +++ b/src/quick/items/qquickflipable.cpp @@ -139,8 +139,8 @@ QQuickFlipable::~QQuickFlipable() } /*! - \qmlproperty Item QtQuick2::Flipable::front - \qmlproperty Item QtQuick2::Flipable::back + \qmlproperty Item QtQuick::Flipable::front + \qmlproperty Item QtQuick::Flipable::back The front and back sides of the flipable. */ @@ -203,7 +203,7 @@ void QQuickFlipable::retransformBack() } /*! - \qmlproperty enumeration QtQuick2::Flipable::side + \qmlproperty enumeration QtQuick::Flipable::side The side of the Flipable currently visible. Possible values are \c Flipable.Front and \c Flipable.Back. diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp index 2d4430abb2..1c6168fbc5 100644 --- a/src/quick/items/qquickgridview.cpp +++ b/src/quick/items/qquickgridview.cpp @@ -1273,14 +1273,14 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) } /*! - \qmlattachedproperty bool QtQuick2::GridView::isCurrentItem + \qmlattachedproperty bool QtQuick::GridView::isCurrentItem This attached property is true if this delegate is the current item; otherwise false. It is attached to each instance of the delegate. */ /*! - \qmlattachedproperty GridView QtQuick2::GridView::view + \qmlattachedproperty GridView QtQuick::GridView::view This attached property holds the view that manages this delegate instance. It is attached to each instance of the delegate. @@ -1289,7 +1289,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) */ /*! - \qmlattachedproperty bool QtQuick2::GridView::delayRemove + \qmlattachedproperty bool QtQuick::GridView::delayRemove This attached property holds whether the delegate may be destroyed. It is attached to each instance of the delegate. The default value is false. @@ -1304,12 +1304,12 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) */ /*! - \qmlattachedsignal QtQuick2::GridView::onAdd() + \qmlattachedsignal QtQuick::GridView::onAdd() This attached handler is called immediately after an item is added to the view. */ /*! - \qmlattachedsignal QtQuick2::GridView::onRemove() + \qmlattachedsignal QtQuick::GridView::onRemove() This attached handler is called immediately before an item is removed from the view. If a \l remove transition has been specified, it is applied after @@ -1318,7 +1318,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) /*! - \qmlproperty model QtQuick2::GridView::model + \qmlproperty model QtQuick::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 @@ -1330,7 +1330,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) */ /*! - \qmlproperty Component QtQuick2::GridView::delegate + \qmlproperty Component QtQuick::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 @@ -1349,8 +1349,8 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) */ /*! - \qmlproperty int QtQuick2::GridView::currentIndex - \qmlproperty Item QtQuick2::GridView::currentItem + \qmlproperty int QtQuick::GridView::currentIndex + \qmlproperty Item QtQuick::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 @@ -1366,7 +1366,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) /*! - \qmlproperty Item QtQuick2::GridView::highlightItem + \qmlproperty Item QtQuick::GridView::highlightItem This holds the highlight item created from the \l highlight component. @@ -1378,13 +1378,13 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) /*! - \qmlproperty int QtQuick2::GridView::count + \qmlproperty int QtQuick::GridView::count This property holds the number of items in the view. */ /*! - \qmlproperty Component QtQuick2::GridView::highlight + \qmlproperty Component QtQuick::GridView::highlight This property holds the component to use as the highlight. An instance of the highlight component is created for each view. @@ -1395,7 +1395,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) */ /*! - \qmlproperty bool QtQuick2::GridView::highlightFollowsCurrentItem + \qmlproperty bool QtQuick::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 @@ -1410,7 +1410,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) /*! - \qmlproperty int QtQuick2::GridView::highlightMoveDuration + \qmlproperty int QtQuick::GridView::highlightMoveDuration This property holds the move animation duration of the highlight delegate. highlightFollowsCurrentItem must be true for this property @@ -1422,9 +1422,9 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) */ /*! - \qmlproperty real QtQuick2::GridView::preferredHighlightBegin - \qmlproperty real QtQuick2::GridView::preferredHighlightEnd - \qmlproperty enumeration QtQuick2::GridView::highlightRangeMode + \qmlproperty real QtQuick::GridView::preferredHighlightBegin + \qmlproperty real QtQuick::GridView::preferredHighlightEnd + \qmlproperty enumeration QtQuick::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 @@ -1454,7 +1454,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) /*! - \qmlproperty enumeration QtQuick2::GridView::layoutDirection + \qmlproperty enumeration QtQuick::GridView::layoutDirection This property holds the layout direction of the grid. Possible values: @@ -1475,7 +1475,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) /*! - \qmlproperty enumeration QtQuick2::GridView::effectiveLayoutDirection + \qmlproperty enumeration QtQuick::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, @@ -1486,7 +1486,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) */ /*! - \qmlproperty enumeration QtQuick2::GridView::verticalLayoutDirection + \qmlproperty enumeration QtQuick::GridView::verticalLayoutDirection This property holds the vertical layout direction of the grid. Possible values: @@ -1500,7 +1500,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) */ /*! - \qmlproperty bool QtQuick2::GridView::keyNavigationWraps + \qmlproperty bool QtQuick::GridView::keyNavigationWraps This property holds whether the grid wraps key navigation If this is true, key navigation that would move the current item selection @@ -1510,7 +1510,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) By default, key navigation is not wrapped. */ /*! - \qmlproperty int QtQuick2::GridView::cacheBuffer + \qmlproperty int QtQuick::GridView::cacheBuffer This property determines whether delegates are retained outside the visible area of the view. @@ -1548,7 +1548,7 @@ void QQuickGridView::setHighlightMoveDuration(int duration) } /*! - \qmlproperty enumeration QtQuick2::GridView::flow + \qmlproperty enumeration QtQuick::GridView::flow This property holds the flow of the grid. Possible values: @@ -1585,8 +1585,8 @@ void QQuickGridView::setFlow(Flow flow) /*! - \qmlproperty real QtQuick2::GridView::cellWidth - \qmlproperty real QtQuick2::GridView::cellHeight + \qmlproperty real QtQuick::GridView::cellWidth + \qmlproperty real QtQuick::GridView::cellHeight These properties holds the width and height of each cell in the grid. @@ -1626,7 +1626,7 @@ void QQuickGridView::setCellHeight(qreal cellHeight) } } /*! - \qmlproperty enumeration QtQuick2::GridView::snapMode + \qmlproperty enumeration QtQuick::GridView::snapMode This property determines how the view scrolling will settle following a drag or flick. The possible values are: @@ -1658,7 +1658,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) /*! - \qmlproperty Component QtQuick2::GridView::footer + \qmlproperty Component QtQuick::GridView::footer This property holds the component to use as the footer. An instance of the footer component is created for each view. The @@ -1667,7 +1667,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) \sa header, footerItem */ /*! - \qmlproperty Component QtQuick2::GridView::header + \qmlproperty Component QtQuick::GridView::header This property holds the component to use as the header. An instance of the header component is created for each view. The @@ -1677,7 +1677,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Item QtQuick2::GridView::headerItem + \qmlproperty Item QtQuick::GridView::headerItem This holds the header item created from the \l header component. An instance of the header component is created for each view. The @@ -1687,7 +1687,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Item QtQuick2::GridView::footerItem + \qmlproperty Item QtQuick::GridView::footerItem This holds the footer item created from the \l footer component. An instance of the footer component is created for each view. The @@ -1697,7 +1697,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::GridView::populate + \qmlproperty Transition QtQuick::GridView::populate This property holds the transition to apply to the items that are initially created for a view. @@ -1731,7 +1731,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::GridView::add + \qmlproperty Transition QtQuick::GridView::add This property holds the transition to apply to items that are added to the view. @@ -1765,7 +1765,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::GridView::addDisplaced + \qmlproperty Transition QtQuick::GridView::addDisplaced This property holds the transition to apply to items within the view that are displaced by the addition of other items to the view. @@ -1803,7 +1803,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) \sa displaced, add, populate, ViewTransition */ /*! - \qmlproperty Transition QtQuick2::GridView::move + \qmlproperty Transition QtQuick::GridView::move This property holds the transition to apply to items in the view that are being moved due to a move operation in the view's \l model. @@ -1832,7 +1832,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::GridView::moveDisplaced + \qmlproperty Transition QtQuick::GridView::moveDisplaced This property holds the transition to apply to items that are displaced by a move operation in the view's \l model. @@ -1868,7 +1868,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::GridView::remove + \qmlproperty Transition QtQuick::GridView::remove This property holds the transition to apply to items that are removed from the view. @@ -1905,7 +1905,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::GridView::removeDisplaced + \qmlproperty Transition QtQuick::GridView::removeDisplaced This property holds the transition to apply to items in the view that are displaced by the removal of other items in the view. @@ -1940,7 +1940,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::GridView::displaced + \qmlproperty Transition QtQuick::GridView::displaced This property holds the generic transition to apply to items that have been displaced by any model operation that affects the view. @@ -2109,7 +2109,7 @@ void QQuickGridView::initItem(int index, QObject *obj) } /*! - \qmlmethod QtQuick2::GridView::moveCurrentIndexUp() + \qmlmethod QtQuick::GridView::moveCurrentIndexUp() Move the currentIndex up one item in the view. The current index will wrap if keyNavigationWraps is true and it @@ -2153,7 +2153,7 @@ void QQuickGridView::moveCurrentIndexUp() } /*! - \qmlmethod QtQuick2::GridView::moveCurrentIndexDown() + \qmlmethod QtQuick::GridView::moveCurrentIndexDown() Move the currentIndex down one item in the view. The current index will wrap if keyNavigationWraps is true and it @@ -2196,7 +2196,7 @@ void QQuickGridView::moveCurrentIndexDown() } /*! - \qmlmethod QtQuick2::GridView::moveCurrentIndexLeft() + \qmlmethod QtQuick::GridView::moveCurrentIndexLeft() Move the currentIndex left one item in the view. The current index will wrap if keyNavigationWraps is true and it @@ -2239,7 +2239,7 @@ void QQuickGridView::moveCurrentIndexLeft() /*! - \qmlmethod QtQuick2::GridView::moveCurrentIndexRight() + \qmlmethod QtQuick::GridView::moveCurrentIndexRight() Move the currentIndex right one item in the view. The current index will wrap if keyNavigationWraps is true and it @@ -2474,7 +2474,7 @@ bool QQuickGridViewPrivate::needsRefillForAddedOrRemovedIndex(int modelIndex) co } /*! - \qmlmethod QtQuick2::GridView::positionViewAtIndex(int index, PositionMode mode) + \qmlmethod QtQuick::GridView::positionViewAtIndex(int index, PositionMode mode) Positions the view such that the \a index is at the position specified by \a mode: @@ -2510,8 +2510,8 @@ bool QQuickGridViewPrivate::needsRefillForAddedOrRemovedIndex(int modelIndex) co */ /*! - \qmlmethod QtQuick2::GridView::positionViewAtBeginning() - \qmlmethod QtQuick2::GridView::positionViewAtEnd() + \qmlmethod QtQuick::GridView::positionViewAtBeginning() + \qmlmethod QtQuick::GridView::positionViewAtEnd() Positions the view at the beginning or end, taking into account any header or footer. @@ -2530,7 +2530,7 @@ bool QQuickGridViewPrivate::needsRefillForAddedOrRemovedIndex(int modelIndex) co */ /*! - \qmlmethod int QtQuick2::GridView::indexAt(int x, int y) + \qmlmethod int QtQuick::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 @@ -2543,7 +2543,7 @@ bool QQuickGridViewPrivate::needsRefillForAddedOrRemovedIndex(int modelIndex) co */ /*! - \qmlmethod Item QtQuick2::GridView::itemAt(int x, int y) + \qmlmethod Item QtQuick::GridView::itemAt(int x, int y) Returns 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 @@ -2557,7 +2557,7 @@ bool QQuickGridViewPrivate::needsRefillForAddedOrRemovedIndex(int modelIndex) co /*! - \qmlmethod QtQuick2::GridView::forceLayout() + \qmlmethod QtQuick::GridView::forceLayout() Responding to changes in the model is usually batched to happen only once per frame. This means that inside script blocks it is possible for the diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index 7a02137f61..3a8fd99a66 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -176,7 +176,7 @@ void QQuickImagePrivate::setImage(const QImage &image) } /*! - \qmlproperty enumeration QtQuick2::Image::fillMode + \qmlproperty enumeration QtQuick::Image::fillMode Set this property to define what happens when the source image has a different size than the item. @@ -289,8 +289,8 @@ void QQuickImage::setFillMode(FillMode mode) /*! - \qmlproperty real QtQuick2::Image::paintedWidth - \qmlproperty real QtQuick2::Image::paintedHeight + \qmlproperty real QtQuick::Image::paintedWidth + \qmlproperty real QtQuick::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 @@ -311,7 +311,7 @@ qreal QQuickImage::paintedHeight() const } /*! - \qmlproperty enumeration QtQuick2::Image::status + \qmlproperty enumeration QtQuick::Image::status This property holds the status of image loading. It can be one of: \list @@ -348,7 +348,7 @@ qreal QQuickImage::paintedHeight() const */ /*! - \qmlproperty real QtQuick2::Image::progress + \qmlproperty real QtQuick::Image::progress This property holds the progress of image loading, from 0.0 (nothing loaded) to 1.0 (finished). @@ -357,7 +357,7 @@ qreal QQuickImage::paintedHeight() const */ /*! - \qmlproperty bool QtQuick2::Image::smooth + \qmlproperty bool QtQuick::Image::smooth This property holds whether the image is smoothly filtered when scaled or transformed. Smooth filtering gives better visual quality, but it may be slower @@ -368,7 +368,7 @@ qreal QQuickImage::paintedHeight() const */ /*! - \qmlproperty QSize QtQuick2::Image::sourceSize + \qmlproperty QSize QtQuick::Image::sourceSize This property holds the actual width and height of the loaded image. @@ -419,7 +419,7 @@ qreal QQuickImage::paintedHeight() const */ /*! - \qmlproperty url QtQuick2::Image::source + \qmlproperty url QtQuick::Image::source Image can handle any image format supported by Qt, loaded from any URL scheme supported by Qt. @@ -429,7 +429,7 @@ qreal QQuickImage::paintedHeight() const */ /*! - \qmlproperty bool QtQuick2::Image::asynchronous + \qmlproperty bool QtQuick::Image::asynchronous Specifies that images on the local filesystem should be loaded asynchronously in a separate thread. The default value is @@ -444,7 +444,7 @@ qreal QQuickImage::paintedHeight() const */ /*! - \qmlproperty bool QtQuick2::Image::cache + \qmlproperty bool QtQuick::Image::cache Specifies whether the image should be cached. The default value is true. Setting \a cache to false is useful when dealing with large images, @@ -452,7 +452,7 @@ qreal QQuickImage::paintedHeight() const */ /*! - \qmlproperty bool QtQuick2::Image::mirror + \qmlproperty bool QtQuick::Image::mirror This property holds whether the image should be horizontally inverted (effectively displaying a mirrored image). @@ -461,8 +461,8 @@ qreal QQuickImage::paintedHeight() const */ /*! - \qmlproperty enumeration QtQuick2::Image::horizontalAlignment - \qmlproperty enumeration QtQuick2::Image::verticalAlignment + \qmlproperty enumeration QtQuick::Image::horizontalAlignment + \qmlproperty enumeration QtQuick::Image::verticalAlignment Sets the horizontal and vertical alignment of the image. By default, the image is center aligned. diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 2ed1a7c0fb..73bca67a1e 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -419,10 +419,10 @@ void QQuickItemKeyFilter::componentComplete() */ /*! - \qmlproperty Item QtQuick2::KeyNavigation::left - \qmlproperty Item QtQuick2::KeyNavigation::right - \qmlproperty Item QtQuick2::KeyNavigation::up - \qmlproperty Item QtQuick2::KeyNavigation::down + \qmlproperty Item QtQuick::KeyNavigation::left + \qmlproperty Item QtQuick::KeyNavigation::right + \qmlproperty Item QtQuick::KeyNavigation::up + \qmlproperty Item QtQuick::KeyNavigation::down These properties hold the item to assign focus to when the left, right, up or down cursor keys @@ -430,8 +430,8 @@ void QQuickItemKeyFilter::componentComplete() */ /*! - \qmlproperty Item QtQuick2::KeyNavigation::tab - \qmlproperty Item QtQuick2::KeyNavigation::backtab + \qmlproperty Item QtQuick::KeyNavigation::tab + \qmlproperty Item QtQuick::KeyNavigation::backtab These properties hold the item to assign focus to when the Tab key or Shift+Tab key combination (Backtab) are pressed. @@ -583,7 +583,7 @@ void QQuickKeyNavigationAttached::setBacktab(QQuickItem *i) } /*! - \qmlproperty enumeration QtQuick2::KeyNavigation::priority + \qmlproperty enumeration QtQuick::KeyNavigation::priority This property determines whether the keys are processed before or after the attached item's own key handling. @@ -873,14 +873,14 @@ bool QQuickKeysAttached::isConnected(const char *signalName) */ /*! - \qmlproperty bool QtQuick2::Keys::enabled + \qmlproperty bool QtQuick::Keys::enabled This flags enables key handling if true (default); otherwise no key handlers will be called. */ /*! - \qmlproperty enumeration QtQuick2::Keys::priority + \qmlproperty enumeration QtQuick::Keys::priority This property determines whether the keys are processed before or after the attached item's own key handling. @@ -896,7 +896,7 @@ bool QQuickKeysAttached::isConnected(const char *signalName) */ /*! - \qmlproperty list<Object> QtQuick2::Keys::forwardTo + \qmlproperty list<Object> QtQuick::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 @@ -923,273 +923,273 @@ bool QQuickKeysAttached::isConnected(const char *signalName) */ /*! - \qmlsignal QtQuick2::Keys::onPressed(KeyEvent event) + \qmlsignal QtQuick::Keys::onPressed(KeyEvent event) This handler is called when a key has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal QtQuick2::Keys::onReleased(KeyEvent event) + \qmlsignal QtQuick::Keys::onReleased(KeyEvent event) This handler is called when a key has been released. The \a event parameter provides information about the event. */ /*! - \qmlsignal QtQuick2::Keys::onDigit0Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDigit1Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDigit2Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDigit3Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDigit4Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDigit5Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDigit6Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDigit7Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDigit8Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDigit9Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onLeftPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onRightPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onUpPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDownPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onTabPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onBacktabPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onAsteriskPressed(KeyEvent event) + \qmlsignal QtQuick::Keys::onAsteriskPressed(KeyEvent event) This handler is called when the Asterisk '*' has been pressed. The \a event parameter provides information about the event. */ /*! - \qmlsignal QtQuick2::Keys::onEscapePressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onReturnPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onEnterPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onDeletePressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onSpacePressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onBackPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onCancelPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onSelectPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onYesPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onNoPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onContext1Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onContext2Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onContext3Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onContext4Pressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onCallPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onHangupPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onFlipPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onMenuPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onVolumeUpPressed(KeyEvent event) + \qmlsignal QtQuick::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 QtQuick2::Keys::onVolumeDownPressed(KeyEvent event) + \qmlsignal QtQuick::Keys::onVolumeDownPressed(KeyEvent event) This handler is called when the VolumeDown key has been pressed. The \a event parameter provides information about the event. @@ -1403,7 +1403,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj) */ /*! - \qmlproperty bool QtQuick2::LayoutMirroring::enabled + \qmlproperty bool QtQuick::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, @@ -1415,7 +1415,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj) */ /*! - \qmlproperty bool QtQuick2::LayoutMirroring::childrenInherit + \qmlproperty bool QtQuick::LayoutMirroring::childrenInherit This property holds whether the \l {enabled}{LayoutMirroring.enabled} value for this item is inherited by its children. @@ -2198,7 +2198,7 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo } /*! - \qmlproperty Item QtQuick2::Item::parent + \qmlproperty Item QtQuick::Item::parent This property holds the visual parent of the item. \note The concept of the \e {visual parent} differs from that of the @@ -2792,7 +2792,7 @@ void QQuickItemPrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o) } /*! - \qmlproperty list<Object> QtQuick2::Item::data + \qmlproperty list<Object> QtQuick::Item::data \default The data property allows you to freely mix visual children and resources @@ -3050,27 +3050,27 @@ void QQuickItemPrivate::_q_resourceObjectDeleted(QObject *object) } /*! - \qmlproperty AnchorLine QtQuick2::Item::anchors.top - \qmlproperty AnchorLine QtQuick2::Item::anchors.bottom - \qmlproperty AnchorLine QtQuick2::Item::anchors.left - \qmlproperty AnchorLine QtQuick2::Item::anchors.right - \qmlproperty AnchorLine QtQuick2::Item::anchors.horizontalCenter - \qmlproperty AnchorLine QtQuick2::Item::anchors.verticalCenter - \qmlproperty AnchorLine QtQuick2::Item::anchors.baseline + \qmlproperty AnchorLine QtQuick::Item::anchors.top + \qmlproperty AnchorLine QtQuick::Item::anchors.bottom + \qmlproperty AnchorLine QtQuick::Item::anchors.left + \qmlproperty AnchorLine QtQuick::Item::anchors.right + \qmlproperty AnchorLine QtQuick::Item::anchors.horizontalCenter + \qmlproperty AnchorLine QtQuick::Item::anchors.verticalCenter + \qmlproperty AnchorLine QtQuick::Item::anchors.baseline - \qmlproperty Item QtQuick2::Item::anchors.fill - \qmlproperty Item QtQuick2::Item::anchors.centerIn + \qmlproperty Item QtQuick::Item::anchors.fill + \qmlproperty Item QtQuick::Item::anchors.centerIn - \qmlproperty real QtQuick2::Item::anchors.margins - \qmlproperty real QtQuick2::Item::anchors.topMargin - \qmlproperty real QtQuick2::Item::anchors.bottomMargin - \qmlproperty real QtQuick2::Item::anchors.leftMargin - \qmlproperty real QtQuick2::Item::anchors.rightMargin - \qmlproperty real QtQuick2::Item::anchors.horizontalCenterOffset - \qmlproperty real QtQuick2::Item::anchors.verticalCenterOffset - \qmlproperty real QtQuick2::Item::anchors.baselineOffset + \qmlproperty real QtQuick::Item::anchors.margins + \qmlproperty real QtQuick::Item::anchors.topMargin + \qmlproperty real QtQuick::Item::anchors.bottomMargin + \qmlproperty real QtQuick::Item::anchors.leftMargin + \qmlproperty real QtQuick::Item::anchors.rightMargin + \qmlproperty real QtQuick::Item::anchors.horizontalCenterOffset + \qmlproperty real QtQuick::Item::anchors.verticalCenterOffset + \qmlproperty real QtQuick::Item::anchors.baselineOffset - \qmlproperty bool QtQuick2::Item::anchors.alignWhenCentered + \qmlproperty bool QtQuick::Item::anchors.alignWhenCentered Anchors provide a way to position an item by specifying its relationship with other items. @@ -3173,10 +3173,10 @@ QQmlListProperty<QObject> QQuickItemPrivate::data() } /*! - \qmlproperty real QtQuick2::Item::childrenRect.x - \qmlproperty real QtQuick2::Item::childrenRect.y - \qmlproperty real QtQuick2::Item::childrenRect.width - \qmlproperty real QtQuick2::Item::childrenRect.height + \qmlproperty real QtQuick::Item::childrenRect.x + \qmlproperty real QtQuick::Item::childrenRect.y + \qmlproperty real QtQuick::Item::childrenRect.width + \qmlproperty real QtQuick::Item::childrenRect.height This property holds the collective position and size of the item's children. @@ -3214,7 +3214,7 @@ QList<QQuickItem *> QQuickItem::childItems() const } /*! - \qmlproperty bool QtQuick2::Item::clip + \qmlproperty bool QtQuick::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 @@ -3759,7 +3759,7 @@ QQuickAnchorLine QQuickItemPrivate::baseline() const } /*! - \qmlproperty int QtQuick2::Item::baselineOffset + \qmlproperty int QtQuick::Item::baselineOffset Specifies the position of the item's baseline in local coordinates. @@ -3852,8 +3852,8 @@ void QQuickItem::polish() } /*! - \qmlmethod object QtQuick2::Item::mapFromItem(Item item, real x, real y) - \qmlmethod object QtQuick2::Item::mapFromItem(Item item, real x, real y, real width, real height) + \qmlmethod object QtQuick::Item::mapFromItem(Item item, real x, real y) + \qmlmethod object QtQuick::Item::mapFromItem(Item item, real x, real y, real width, real height) Maps the point (\a x, \a y) or rect (\a x, \a y, \a width, \a height), which is in \a item's coordinate system, to this item's coordinate system, and returns an object with \c x and @@ -3931,8 +3931,8 @@ QTransform QQuickItem::itemTransform(QQuickItem *other, bool *ok) const } /*! - \qmlmethod object QtQuick2::Item::mapToItem(Item item, real x, real y) - \qmlmethod object QtQuick2::Item::mapToItem(Item item, real x, real y, real width, real height) + \qmlmethod object QtQuick::Item::mapToItem(Item item, real x, real y) + \qmlmethod object QtQuick::Item::mapToItem(Item item, real x, real y, real width, real height) Maps the point (\a x, \a y) or rect (\a x, \a y, \a width, \a height), which is in this item's coordinate system, to \a item's coordinate system, and returns an object with \c x and @@ -3994,7 +3994,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const } /*! - \qmlmethod QtQuick2::Item::forceActiveFocus() + \qmlmethod QtQuick::Item::forceActiveFocus() \overload Forces active focus on the item. @@ -4014,7 +4014,7 @@ void QQuickItem::forceActiveFocus() } /*! - \qmlmethod QtQuick2::Item::forceActiveFocus(Qt::FocusReason reason) + \qmlmethod QtQuick::Item::forceActiveFocus(Qt::FocusReason reason) Forces active focus on the item with the given \a reason. @@ -4039,7 +4039,7 @@ void QQuickItem::forceActiveFocus(Qt::FocusReason reason) } /*! - \qmlmethod QtQuick2::Item::nextItemInFocusChain(bool forward) + \qmlmethod QtQuick::Item::nextItemInFocusChain(bool forward) \since 5.1 @@ -4061,7 +4061,7 @@ QQuickItem *QQuickItem::nextItemInFocusChain(bool forward) } /*! - \qmlmethod QtQuick2::Item::childAt(real x, real y) + \qmlmethod QtQuick::Item::childAt(real x, real y) Returns the first visible child item found at point (\a x, \a y) within the coordinate system of this item. @@ -4099,8 +4099,8 @@ QQmlListProperty<QObject> QQuickItemPrivate::resources() } /*! - \qmlproperty list<Item> QtQuick2::Item::children - \qmlproperty list<Object> QtQuick2::Item::resources + \qmlproperty list<Item> QtQuick::Item::children + \qmlproperty list<Object> QtQuick::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 @@ -4125,7 +4125,7 @@ QQmlListProperty<QQuickItem> QQuickItemPrivate::children() } /*! - \qmlproperty real QtQuick2::Item::visibleChildren + \qmlproperty real QtQuick::Item::visibleChildren This read-only property lists all of the item's children that are currently visible. Note that a child's visibility may have changed explicitly, or because the visibility of this (it's parent) item or another grandparent changed. @@ -4144,7 +4144,7 @@ QQmlListProperty<QQuickItem> QQuickItemPrivate::visibleChildren() } /*! - \qmlproperty list<State> QtQuick2::Item::states + \qmlproperty list<State> QtQuick::Item::states This property holds the list of possible states for this item. To change the state of this item, set the \l state property to one of these states, @@ -4189,7 +4189,7 @@ QQmlListProperty<QQuickState> QQuickItemPrivate::states() } /*! - \qmlproperty list<Transition> QtQuick2::Item::transitions + \qmlproperty list<Transition> QtQuick::Item::transitions This property holds the list of transitions for this item. These define the transitions to be applied to the item whenever it changes its \l state. @@ -4239,7 +4239,7 @@ void QQuickItemPrivate::setState(const QString &state) } /*! - \qmlproperty string QtQuick2::Item::state + \qmlproperty string QtQuick::Item::state This property holds the name of the current state of the item. @@ -4273,7 +4273,7 @@ void QQuickItem::setState(const QString &state) } /*! - \qmlproperty list<Transform> QtQuick2::Item::transform + \qmlproperty list<Transform> QtQuick::Item::transform This property holds the list of transformations to apply. For more information see \l Transform. @@ -4604,7 +4604,7 @@ QRectF QQuickItem::clipRect() const } /*! - \qmlproperty enumeration QtQuick2::Item::transformOrigin + \qmlproperty enumeration QtQuick::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. @@ -4680,7 +4680,7 @@ void QQuickItem::setTransformOriginPoint(const QPointF &point) } /*! - \qmlproperty real QtQuick2::Item::z + \qmlproperty real QtQuick::Item::z Sets the stacking order of sibling items. By default the stacking order is 0. @@ -4860,7 +4860,7 @@ void QQuickItem::setZ(qreal v) } /*! - \qmlproperty real QtQuick2::Item::rotation + \qmlproperty real QtQuick::Item::rotation This property holds the rotation of the item in degrees clockwise around its transformOrigin. @@ -4933,7 +4933,7 @@ void QQuickItem::setRotation(qreal r) } /*! - \qmlproperty real QtQuick2::Item::scale + \qmlproperty real QtQuick::Item::scale This property holds the scale factor for this item. A scale of less than 1.0 causes the item to be rendered at a smaller @@ -5030,7 +5030,7 @@ void QQuickItem::setScale(qreal s) } /*! - \qmlproperty real QtQuick2::Item::opacity + \qmlproperty real QtQuick::Item::opacity This property holds the opacity of the item. Opacity is specified as a number between 0.0 (fully transparent) and 1.0 (fully opaque). The default @@ -5159,7 +5159,7 @@ void QQuickItem::setOpacity(qreal o) } /*! - \qmlproperty bool QtQuick2::Item::visible + \qmlproperty bool QtQuick::Item::visible This property holds whether the item is visible. By default this is true. @@ -5234,7 +5234,7 @@ void QQuickItem::setVisible(bool v) } /*! - \qmlproperty bool QtQuick2::Item::enabled + \qmlproperty bool QtQuick::Item::enabled This property holds whether the item receives mouse and keyboard events. By default this is true. @@ -5566,7 +5566,7 @@ void QQuickItemPrivate::itemChange(QQuickItem::ItemChange change, const QQuickIt } /*! - \qmlproperty bool QtQuick2::Item::smooth + \qmlproperty bool QtQuick::Item::smooth Primarily used in image based items to decide if the item should use smooth sampling or not. Smooth sampling is performed using linear interpolation, while @@ -5606,7 +5606,7 @@ void QQuickItem::setSmooth(bool smooth) } /*! - \qmlproperty bool QtQuick2::Item::activeFocusOnTab + \qmlproperty bool QtQuick::Item::activeFocusOnTab This property holds whether the item wants to be in tab focus chain. By default this is set to false. @@ -5653,7 +5653,7 @@ void QQuickItem::setActiveFocusOnTab(bool activeFocusOnTab) } /*! - \qmlproperty bool QtQuick2::Item::antialiasing + \qmlproperty bool QtQuick::Item::antialiasing Primarily used in Rectangle and image based elements to decide if the item should use antialiasing or not. Items with antialiasing enabled require more memory and @@ -5742,10 +5742,10 @@ void QQuickItem::setFlags(Flags flags) } /*! - \qmlproperty real QtQuick2::Item::x - \qmlproperty real QtQuick2::Item::y - \qmlproperty real QtQuick2::Item::width - \qmlproperty real QtQuick2::Item::height + \qmlproperty real QtQuick::Item::x + \qmlproperty real QtQuick::Item::y + \qmlproperty real QtQuick::Item::width + \qmlproperty real QtQuick::Item::height Defines the item's position and size. @@ -5904,8 +5904,8 @@ qreal QQuickItem::implicitWidth() const } /*! - \qmlproperty real QtQuick2::Item::implicitWidth - \qmlproperty real QtQuick2::Item::implicitHeight + \qmlproperty real QtQuick::Item::implicitWidth + \qmlproperty real QtQuick::Item::implicitHeight Defines the natural width or height of the Item if no \l width or \l height is specified. @@ -6170,7 +6170,7 @@ void QQuickItem::setSize(const QSizeF &size) } /*! - \qmlproperty bool QtQuick2::Item::activeFocus + \qmlproperty bool QtQuick::Item::activeFocus This read-only property indicates whether the item has active focus. @@ -6243,7 +6243,7 @@ bool QQuickItem::hasActiveFocus() const } /*! - \qmlproperty bool QtQuick2::Item::focus + \qmlproperty bool QtQuick::Item::focus This property holds whether the item has focus within the enclosing FocusScope. If true, this item will gain active focus when the @@ -6777,7 +6777,7 @@ void QQuickItem::setKeepTouchGrab(bool keep) } /*! - \qmlmethod object QtQuick2::Item::contains(point point) + \qmlmethod object QtQuick::Item::contains(point point) Returns true if this item contains \a point, which is in local coordinates; returns false otherwise. @@ -7150,7 +7150,7 @@ QQuickItemLayer::~QQuickItemLayer() } /*! - \qmlproperty bool QtQuick2::Item::layer.enabled + \qmlproperty bool QtQuick::Item::layer.enabled Holds whether the item is layered or not. Layering is disabled by default. @@ -7274,7 +7274,7 @@ void QQuickItemLayer::deactivateEffect() /*! - \qmlproperty Component QtQuick2::Item::layer.effect + \qmlproperty Component QtQuick::Item::layer.effect Holds the effect that is applied to this layer. @@ -7315,7 +7315,7 @@ void QQuickItemLayer::setEffect(QQmlComponent *component) /*! - \qmlproperty bool QtQuick2::Item::layer.mipmap + \qmlproperty bool QtQuick::Item::layer.mipmap If this property is true, mipmaps are generated for the texture. @@ -7337,7 +7337,7 @@ void QQuickItemLayer::setMipmap(bool mipmap) /*! - \qmlproperty enumeration QtQuick2::Item::layer.format + \qmlproperty enumeration QtQuick::Item::layer.format This property defines the internal OpenGL format of the texture. Modifying this property makes most sense when the \a layer.effect is also @@ -7367,7 +7367,7 @@ void QQuickItemLayer::setFormat(QQuickShaderEffectSource::Format f) /*! - \qmlproperty rect QtQuick2::Item::layer.sourceRect + \qmlproperty rect QtQuick::Item::layer.sourceRect This property defines the rectangular area of the item that should be rendered into the texture. The source rectangle can be larger than @@ -7388,7 +7388,7 @@ void QQuickItemLayer::setSourceRect(const QRectF &sourceRect) } /*! - \qmlproperty bool QtQuick2::Item::layer.smooth + \qmlproperty bool QtQuick::Item::layer.smooth Holds whether the layer is smoothly transformed. */ @@ -7406,7 +7406,7 @@ void QQuickItemLayer::setSmooth(bool s) } /*! - \qmlproperty size QtQuick2::Item::layer.textureSize + \qmlproperty size QtQuick::Item::layer.textureSize This property holds the requested pixel size of the layers texture. If it is empty, which is the default, the size of the item is used. @@ -7429,7 +7429,7 @@ void QQuickItemLayer::setSize(const QSize &size) } /*! - \qmlproperty enumeration QtQuick2::Item::layer.wrapMode + \qmlproperty enumeration QtQuick::Item::layer.wrapMode This property defines the OpenGL wrap modes associated with the texture. Modifying this property makes most sense when the \a layer.effect is @@ -7459,7 +7459,7 @@ void QQuickItemLayer::setWrapMode(QQuickShaderEffectSource::WrapMode mode) } /*! - \qmlproperty string QtQuick2::Item::layer.samplerName + \qmlproperty string QtQuick::Item::layer.samplerName Holds the name of the effect's source texture property. diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp index ac97b27718..ae1233463e 100644 --- a/src/quick/items/qquickitemanimation.cpp +++ b/src/quick/items/qquickitemanimation.cpp @@ -98,7 +98,7 @@ QQuickParentAnimation::~QQuickParentAnimation() } /*! - \qmlproperty Item QtQuick2::ParentAnimation::target + \qmlproperty Item QtQuick::ParentAnimation::target The item to reparent. When used in a transition, if no target is specified, all @@ -121,7 +121,7 @@ void QQuickParentAnimation::setTargetObject(QQuickItem *target) } /*! - \qmlproperty Item QtQuick2::ParentAnimation::newParent + \qmlproperty Item QtQuick::ParentAnimation::newParent The new parent to animate to. If the ParentAnimation is defined within a \l Transition, @@ -145,7 +145,7 @@ void QQuickParentAnimation::setNewParent(QQuickItem *newParent) } /*! - \qmlproperty Item QtQuick2::ParentAnimation::via + \qmlproperty Item QtQuick::ParentAnimation::via The item to reparent via. This provides a way to do an unclipped animation when both the old parent and new parent are clipped. @@ -447,7 +447,7 @@ QQuickAnchorAnimation::~QQuickAnchorAnimation() } /*! - \qmlproperty list<Item> QtQuick2::AnchorAnimation::targets + \qmlproperty list<Item> QtQuick::AnchorAnimation::targets The items to reanchor. If no targets are specified all AnchorChanges will be @@ -460,7 +460,7 @@ QQmlListProperty<QQuickItem> QQuickAnchorAnimation::targets() } /*! - \qmlproperty int QtQuick2::AnchorAnimation::duration + \qmlproperty int QtQuick::AnchorAnimation::duration This property holds the duration of the animation, in milliseconds. The default value is 250. @@ -486,10 +486,10 @@ void QQuickAnchorAnimation::setDuration(int duration) } /*! - \qmlproperty enumeration QtQuick2::AnchorAnimation::easing.type - \qmlproperty real QtQuick2::AnchorAnimation::easing.amplitude - \qmlproperty real QtQuick2::AnchorAnimation::easing.overshoot - \qmlproperty real QtQuick2::AnchorAnimation::easing.period + \qmlproperty enumeration QtQuick::AnchorAnimation::easing.type + \qmlproperty real QtQuick::AnchorAnimation::easing.amplitude + \qmlproperty real QtQuick::AnchorAnimation::easing.overshoot + \qmlproperty real QtQuick::AnchorAnimation::easing.period \brief Specifies the easing curve used for the animation To specify an easing curve you need to specify at least the type. For some curves you can also specify @@ -596,7 +596,7 @@ QQuickPathAnimation::~QQuickPathAnimation() } /*! - \qmlproperty int QtQuick2::PathAnimation::duration + \qmlproperty int QtQuick::PathAnimation::duration This property holds the duration of the animation, in milliseconds. The default value is 250. @@ -622,11 +622,11 @@ void QQuickPathAnimation::setDuration(int duration) } /*! - \qmlproperty enumeration QtQuick2::PathAnimation::easing.type - \qmlproperty real QtQuick2::PathAnimation::easing.amplitude - \qmlproperty list<real> QtQuick2::PathAnimation::easing.bezierCurve - \qmlproperty real QtQuick2::PathAnimation::easing.overshoot - \qmlproperty real QtQuick2::PathAnimation::easing.period + \qmlproperty enumeration QtQuick::PathAnimation::easing.type + \qmlproperty real QtQuick::PathAnimation::easing.amplitude + \qmlproperty list<real> QtQuick::PathAnimation::easing.bezierCurve + \qmlproperty real QtQuick::PathAnimation::easing.overshoot + \qmlproperty real QtQuick::PathAnimation::easing.period \brief the easing curve used for the animation. To specify an easing curve you need to specify at least the type. For some curves you can also specify @@ -652,7 +652,7 @@ void QQuickPathAnimation::setEasing(const QEasingCurve &e) } /*! - \qmlproperty Path QtQuick2::PathAnimation::path + \qmlproperty Path QtQuick::PathAnimation::path This property holds the path to animate along. For more information on defining a path see the \l Path documentation. @@ -674,7 +674,7 @@ void QQuickPathAnimation::setPath(QQuickPath *path) } /*! - \qmlproperty Item QtQuick2::PathAnimation::target + \qmlproperty Item QtQuick::PathAnimation::target This property holds the item to animate. */ QQuickItem *QQuickPathAnimation::target() const @@ -694,7 +694,7 @@ void QQuickPathAnimation::setTargetObject(QQuickItem *target) } /*! - \qmlproperty enumeration QtQuick2::PathAnimation::orientation + \qmlproperty enumeration QtQuick::PathAnimation::orientation This property controls the rotation of the item as it animates along the path. If a value other than \c Fixed is specified, the PathAnimation will rotate the @@ -726,7 +726,7 @@ void QQuickPathAnimation::setOrientation(Orientation orientation) } /*! - \qmlproperty point QtQuick2::PathAnimation::anchorPoint + \qmlproperty point QtQuick::PathAnimation::anchorPoint This property holds the anchor point for the item being animated. By default, the upper-left corner of the target (its 0,0 point) @@ -751,7 +751,7 @@ void QQuickPathAnimation::setAnchorPoint(const QPointF &point) } /*! - \qmlproperty real QtQuick2::PathAnimation::orientationEntryDuration + \qmlproperty real QtQuick::PathAnimation::orientationEntryDuration This property holds the duration (in milliseconds) of the transition in to the orientation. If an orientation has been specified for the PathAnimation, and the starting @@ -775,7 +775,7 @@ void QQuickPathAnimation::setOrientationEntryDuration(int duration) } /*! - \qmlproperty real QtQuick2::PathAnimation::orientationExitDuration + \qmlproperty real QtQuick::PathAnimation::orientationExitDuration This property holds the duration (in milliseconds) of the transition out of the orientation. If an orientation and endRotation have been specified for the PathAnimation, @@ -798,7 +798,7 @@ void QQuickPathAnimation::setOrientationExitDuration(int duration) } /*! - \qmlproperty real QtQuick2::PathAnimation::endRotation + \qmlproperty real QtQuick::PathAnimation::endRotation This property holds the ending rotation for the target. If an orientation has been specified for the PathAnimation, diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index a010c40f3e..22c0f9426e 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -856,7 +856,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) */ /*! - \qmlattachedproperty list QtQuick2::ViewTransition::index + \qmlattachedproperty list QtQuick::ViewTransition::index This attached property holds the index of the item that is being transitioned. @@ -866,7 +866,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) */ /*! - \qmlattachedproperty list QtQuick2::ViewTransition::item + \qmlattachedproperty list QtQuick::ViewTransition::item This attached property holds the item that is being transitioned. @@ -875,7 +875,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) */ /*! - \qmlattachedproperty list QtQuick2::ViewTransition::destination + \qmlattachedproperty list QtQuick::ViewTransition::destination This attached property holds the final destination position for the transitioned item within the view. @@ -884,7 +884,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) */ /*! - \qmlattachedproperty list QtQuick2::ViewTransition::targetIndexes + \qmlattachedproperty list QtQuick::ViewTransition::targetIndexes This attached property holds a list of the indexes of the items in view that are the target of the relevant operation. @@ -901,11 +901,11 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) \note The targetIndexes list only contains the indexes of items that are actually in view, or will be in the view once the relevant operation completes. - \sa QtQuick2::ViewTransition::targetIndexes + \sa QtQuick::ViewTransition::targetIndexes */ /*! - \qmlattachedproperty list QtQuick2::ViewTransition::targetItems + \qmlattachedproperty list QtQuick::ViewTransition::targetItems This attached property holds the list of items in view that are the target of the relevant operation. @@ -928,7 +928,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) they should not be used by ScriptAction objects in the Transition, which are not evaluated until the transition is run. - \sa QtQuick2::ViewTransition::targetIndexes + \sa QtQuick::ViewTransition::targetIndexes */ QQmlListProperty<QObject> QQuickViewTransitionAttached::targetItems() { diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index af66a40fcd..22d8176086 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.cpp @@ -1756,7 +1756,7 @@ QQuickListView::~QQuickListView() } /*! - \qmlattachedproperty bool QtQuick2::ListView::isCurrentItem + \qmlattachedproperty bool QtQuick::ListView::isCurrentItem This attached property is true if this delegate is the current item; otherwise false. It is attached to each instance of the delegate. @@ -1767,14 +1767,14 @@ QQuickListView::~QQuickListView() */ /*! - \qmlattachedproperty ListView QtQuick2::ListView::view + \qmlattachedproperty ListView QtQuick::ListView::view This attached property holds the view that manages this delegate instance. It is attached to each instance of the delegate. */ /*! - \qmlattachedproperty string QtQuick2::ListView::previousSection + \qmlattachedproperty string QtQuick::ListView::previousSection This attached property holds the section of the previous element. It is attached to each instance of the delegate. @@ -1783,7 +1783,7 @@ QQuickListView::~QQuickListView() */ /*! - \qmlattachedproperty string QtQuick2::ListView::nextSection + \qmlattachedproperty string QtQuick::ListView::nextSection This attached property holds the section of the next element. It is attached to each instance of the delegate. @@ -1792,7 +1792,7 @@ QQuickListView::~QQuickListView() */ /*! - \qmlattachedproperty string QtQuick2::ListView::section + \qmlattachedproperty string QtQuick::ListView::section This attached property holds the section of this element. It is attached to each instance of the delegate. @@ -1801,7 +1801,7 @@ QQuickListView::~QQuickListView() */ /*! - \qmlattachedproperty bool QtQuick2::ListView::delayRemove + \qmlattachedproperty bool QtQuick::ListView::delayRemove This attached property holds whether the delegate may be destroyed. It is attached to each instance of the delegate. The default value is false. @@ -1817,7 +1817,7 @@ QQuickListView::~QQuickListView() */ /*! - \qmlattachedsignal QtQuick2::ListView::onAdd() + \qmlattachedsignal QtQuick::ListView::onAdd() This attached signal handler is called immediately after an item is added to the view. If an \l add transition is specified, it is applied immediately after @@ -1825,7 +1825,7 @@ QQuickListView::~QQuickListView() */ /*! - \qmlattachedsignal QtQuick2::ListView::onRemove() + \qmlattachedsignal QtQuick::ListView::onRemove() This attached handler is called immediately before an item is removed from the view. If a \l remove transition has been specified, it is applied after @@ -1833,7 +1833,7 @@ QQuickListView::~QQuickListView() */ /*! - \qmlproperty model QtQuick2::ListView::model + \qmlproperty model QtQuick::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 @@ -1845,7 +1845,7 @@ QQuickListView::~QQuickListView() */ /*! - \qmlproperty Component QtQuick2::ListView::delegate + \qmlproperty Component QtQuick::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 @@ -1867,8 +1867,8 @@ QQuickListView::~QQuickListView() State should \e never be stored in a delegate. */ /*! - \qmlproperty int QtQuick2::ListView::currentIndex - \qmlproperty Item QtQuick2::ListView::currentItem + \qmlproperty int QtQuick::ListView::currentIndex + \qmlproperty Item QtQuick::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 @@ -1883,7 +1883,7 @@ QQuickListView::~QQuickListView() */ /*! - \qmlproperty Item QtQuick2::ListView::highlightItem + \qmlproperty Item QtQuick::ListView::highlightItem This holds the highlight item created from the \l highlight component. @@ -1894,12 +1894,12 @@ QQuickListView::~QQuickListView() */ /*! - \qmlproperty int QtQuick2::ListView::count + \qmlproperty int QtQuick::ListView::count This property holds the number of items in the view. */ /*! - \qmlproperty Component QtQuick2::ListView::highlight + \qmlproperty Component QtQuick::ListView::highlight This property holds the component to use as the highlight. An instance of the highlight component is created for each list. @@ -1911,7 +1911,7 @@ QQuickListView::~QQuickListView() */ /*! - \qmlproperty bool QtQuick2::ListView::highlightFollowsCurrentItem + \qmlproperty bool QtQuick::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 @@ -1931,9 +1931,9 @@ QQuickListView::~QQuickListView() */ //###Possibly rename these properties, since they are very useful even without a highlight? /*! - \qmlproperty real QtQuick2::ListView::preferredHighlightBegin - \qmlproperty real QtQuick2::ListView::preferredHighlightEnd - \qmlproperty enumeration QtQuick2::ListView::highlightRangeMode + \qmlproperty real QtQuick::ListView::preferredHighlightBegin + \qmlproperty real QtQuick::ListView::preferredHighlightEnd + \qmlproperty enumeration QtQuick::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 @@ -1975,7 +1975,7 @@ void QQuickListView::setHighlightFollowsCurrentItem(bool autoHighlight) } /*! - \qmlproperty real QtQuick2::ListView::spacing + \qmlproperty real QtQuick::ListView::spacing This property holds the spacing between items. @@ -1998,7 +1998,7 @@ void QQuickListView::setSpacing(qreal spacing) } /*! - \qmlproperty enumeration QtQuick2::ListView::orientation + \qmlproperty enumeration QtQuick::ListView::orientation This property holds the orientation of the list. Possible values: @@ -2044,7 +2044,7 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation) } /*! - \qmlproperty enumeration QtQuick2::ListView::layoutDirection + \qmlproperty enumeration QtQuick::ListView::layoutDirection This property holds the layout direction of a horizontally-oriented list. Possible values: @@ -2061,7 +2061,7 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation) /*! - \qmlproperty enumeration QtQuick2::ListView::effectiveLayoutDirection + \qmlproperty enumeration QtQuick::ListView::effectiveLayoutDirection This property holds the effective layout direction of a horizontally-oriented list. When using the attached property \l {LayoutMirroring::enabled}{LayoutMirroring::enabled} for locale layouts, @@ -2073,7 +2073,7 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation) /*! - \qmlproperty enumeration QtQuick2::ListView::verticalLayoutDirection + \qmlproperty enumeration QtQuick::ListView::verticalLayoutDirection This property holds the layout direction of a vertically-oriented list. Possible values: @@ -2090,7 +2090,7 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation) /*! - \qmlproperty bool QtQuick2::ListView::keyNavigationWraps + \qmlproperty bool QtQuick::ListView::keyNavigationWraps This property holds whether the list wraps key navigation. If this is true, key navigation that would move the current item selection @@ -2102,7 +2102,7 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation) /*! - \qmlproperty int QtQuick2::ListView::cacheBuffer + \qmlproperty int QtQuick::ListView::cacheBuffer This property determines whether delegates are retained outside the visible area of the view. @@ -2129,10 +2129,10 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation) /*! - \qmlproperty string QtQuick2::ListView::section.property - \qmlproperty enumeration QtQuick2::ListView::section.criteria - \qmlproperty Component QtQuick2::ListView::section.delegate - \qmlproperty enumeration QtQuick2::ListView::section.labelPositioning + \qmlproperty string QtQuick::ListView::section.property + \qmlproperty enumeration QtQuick::ListView::section.criteria + \qmlproperty Component QtQuick::ListView::section.delegate + \qmlproperty enumeration QtQuick::ListView::section.labelPositioning These properties determine the expression to be evaluated and appearance of the section labels. @@ -2203,7 +2203,7 @@ QQuickViewSection *QQuickListView::sectionCriteria() } /*! - \qmlproperty string QtQuick2::ListView::currentSection + \qmlproperty string QtQuick::ListView::currentSection This property holds the section that is currently at the beginning of the view. */ QString QQuickListView::currentSection() const @@ -2213,10 +2213,10 @@ QString QQuickListView::currentSection() const } /*! - \qmlproperty real QtQuick2::ListView::highlightMoveVelocity - \qmlproperty int QtQuick2::ListView::highlightMoveDuration - \qmlproperty real QtQuick2::ListView::highlightResizeVelocity - \qmlproperty int QtQuick2::ListView::highlightResizeDuration + \qmlproperty real QtQuick::ListView::highlightMoveVelocity + \qmlproperty int QtQuick::ListView::highlightMoveDuration + \qmlproperty real QtQuick::ListView::highlightResizeVelocity + \qmlproperty int QtQuick::ListView::highlightResizeDuration These properties control the speed of the move and resize animations for the highlight delegate. @@ -2294,7 +2294,7 @@ void QQuickListView::setHighlightResizeDuration(int duration) } /*! - \qmlproperty enumeration QtQuick2::ListView::snapMode + \qmlproperty enumeration QtQuick::ListView::snapMode This property determines how the view scrolling will settle following a drag or flick. The possible values are: @@ -2332,7 +2332,7 @@ void QQuickListView::setSnapMode(SnapMode mode) /*! - \qmlproperty Component QtQuick2::ListView::footer + \qmlproperty Component QtQuick::ListView::footer This property holds the component to use as the footer. An instance of the footer component is created for each view. The @@ -2343,7 +2343,7 @@ void QQuickListView::setSnapMode(SnapMode mode) /*! - \qmlproperty Component QtQuick2::ListView::header + \qmlproperty Component QtQuick::ListView::header This property holds the component to use as the header. An instance of the header component is created for each view. The @@ -2353,7 +2353,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Item QtQuick2::ListView::headerItem + \qmlproperty Item QtQuick::ListView::headerItem This holds the header item created from the \l header component. An instance of the header component is created for each view. The @@ -2363,7 +2363,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Item QtQuick2::ListView::footerItem + \qmlproperty Item QtQuick::ListView::footerItem This holds the footer item created from the \l footer component. An instance of the footer component is created for each view. The @@ -2373,7 +2373,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::ListView::populate + \qmlproperty Transition QtQuick::ListView::populate This property holds the transition to apply to the items that are initially created for a view. @@ -2407,7 +2407,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::ListView::add + \qmlproperty Transition QtQuick::ListView::add This property holds the transition to apply to items that are added to the view. @@ -2441,7 +2441,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::ListView::addDisplaced + \qmlproperty Transition QtQuick::ListView::addDisplaced This property holds the transition to apply to items within the view that are displaced by the addition of other items to the view. @@ -2480,7 +2480,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::ListView::move + \qmlproperty Transition QtQuick::ListView::move This property holds the transition to apply to items in the view that are being moved due to a move operation in the view's \l model. @@ -2509,7 +2509,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::ListView::moveDisplaced + \qmlproperty Transition QtQuick::ListView::moveDisplaced This property holds the transition to apply to items that are displaced by a move operation in the view's \l model. @@ -2545,7 +2545,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::ListView::remove + \qmlproperty Transition QtQuick::ListView::remove This property holds the transition to apply to items that are removed from the view. @@ -2582,7 +2582,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::ListView::removeDisplaced + \qmlproperty Transition QtQuick::ListView::removeDisplaced This property holds the transition to apply to items in the view that are displaced by the removal of other items in the view. @@ -2617,7 +2617,7 @@ void QQuickListView::setSnapMode(SnapMode mode) */ /*! - \qmlproperty Transition QtQuick2::ListView::displaced + \qmlproperty Transition QtQuick::ListView::displaced This property holds the generic transition to apply to items that have been displaced by any model operation that affects the view. @@ -2816,7 +2816,7 @@ void QQuickListView::initItem(int index, QObject *object) /*! - \qmlmethod QtQuick2::ListView::incrementCurrentIndex() + \qmlmethod QtQuick::ListView::incrementCurrentIndex() Increments the current index. The current index will wrap if keyNavigationWraps is true and it is currently at the end. @@ -2836,7 +2836,7 @@ void QQuickListView::incrementCurrentIndex() } /*! - \qmlmethod QtQuick2::ListView::decrementCurrentIndex() + \qmlmethod QtQuick::ListView::decrementCurrentIndex() Decrements the current index. The current index will wrap if keyNavigationWraps is true and it is currently at the beginning. @@ -3023,7 +3023,7 @@ void QQuickListViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex } /*! - \qmlmethod QtQuick2::ListView::positionViewAtIndex(int index, PositionMode mode) + \qmlmethod QtQuick::ListView::positionViewAtIndex(int index, PositionMode mode) Positions the view such that the \a index is at the position specified by \a mode: @@ -3060,8 +3060,8 @@ void QQuickListViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex */ /*! - \qmlmethod QtQuick2::ListView::positionViewAtBeginning() - \qmlmethod QtQuick2::ListView::positionViewAtEnd() + \qmlmethod QtQuick::ListView::positionViewAtBeginning() + \qmlmethod QtQuick::ListView::positionViewAtEnd() Positions the view at the beginning or end, taking into account any header or footer. @@ -3080,7 +3080,7 @@ void QQuickListViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex */ /*! - \qmlmethod int QtQuick2::ListView::indexAt(int x, int y) + \qmlmethod int QtQuick::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 @@ -3093,7 +3093,7 @@ void QQuickListViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex */ /*! - \qmlmethod Item QtQuick2::ListView::itemAt(int x, int y) + \qmlmethod Item QtQuick::ListView::itemAt(int x, int y) Returns 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 @@ -3106,7 +3106,7 @@ void QQuickListViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex */ /*! - \qmlmethod QtQuick2::ListView::forceLayout() + \qmlmethod QtQuick::ListView::forceLayout() Responding to changes in the model is usually batched to happen only once per frame. This means that inside script blocks it is possible for the diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 8f61205d91..7d04be2393 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -270,7 +270,7 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const In some cases you may wish to use a Loader within a view delegate to improve delegate loading performance. This works well in most cases, but there is one important issue to - be aware of related to the \l{QtQuick2::Component#creation-context}{creation context} of a Component. + be aware of related to the \l{QtQuick::Component#creation-context}{creation context} of a Component. In the following example, the \c index context property inserted by the ListView into \c delegateComponent's context will be inaccessible to Text, as the Loader will use the creation context of \c myComponent as the parent @@ -310,7 +310,7 @@ QQuickLoader::~QQuickLoader() } /*! - \qmlproperty bool QtQuick2::Loader::active + \qmlproperty bool QtQuick::Loader::active This property is \c true if the Loader is currently active. The default value for this property is \c true. @@ -373,7 +373,7 @@ void QQuickLoader::setActive(bool newVal) /*! - \qmlproperty url QtQuick2::Loader::source + \qmlproperty url QtQuick::Loader::source This property holds the URL of the QML component to instantiate. Since \c {QtQuick 2.0}, Loader is able to load any type of object; it @@ -433,7 +433,7 @@ void QQuickLoader::loadFromSource() } /*! - \qmlproperty Component QtQuick2::Loader::sourceComponent + \qmlproperty Component QtQuick::Loader::sourceComponent This property holds the \l{Component} to instantiate. \qml @@ -501,7 +501,7 @@ void QQuickLoader::loadFromSourceComponent() } /*! - \qmlmethod object QtQuick2::Loader::setSource(url source, object properties) + \qmlmethod object QtQuick::Loader::setSource(url source, object properties) Creates an object instance of the given \a source component that will have the given \a properties. The \a properties argument is optional. The instance @@ -721,7 +721,7 @@ void QQuickLoaderPrivate::_q_sourceLoaded() } /*! - \qmlproperty enumeration QtQuick2::Loader::status + \qmlproperty enumeration QtQuick::Loader::status This property holds the status of QML loading. It can be one of: \list @@ -811,7 +811,7 @@ void QQuickLoader::componentComplete() } /*! - \qmlsignal QtQuick2::Loader::onLoaded() + \qmlsignal QtQuick::Loader::onLoaded() This handler is called when the \l status becomes \c Loader.Ready, or on successful initial load. @@ -819,7 +819,7 @@ void QQuickLoader::componentComplete() /*! -\qmlproperty real QtQuick2::Loader::progress +\qmlproperty real QtQuick::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 @@ -841,7 +841,7 @@ qreal QQuickLoader::progress() const } /*! -\qmlproperty bool QtQuick2::Loader::asynchronous +\qmlproperty bool QtQuick::Loader::asynchronous This property holds whether the component will be instantiated asynchronously. @@ -905,7 +905,7 @@ void QQuickLoaderPrivate::_q_updateSize(bool loaderGeometryChanged) } /*! - \qmlproperty object QtQuick2::Loader::item + \qmlproperty object QtQuick::Loader::item This property holds the top-level object that is currently loaded. Since \c {QtQuick 2.0}, Loader can load any object type. diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index 3219d7def9..b9e6efaa10 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -259,7 +259,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onEntered() + \qmlsignal QtQuick::MouseArea::onEntered() This handler is called when the mouse enters the mouse area. @@ -271,7 +271,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onExited() + \qmlsignal QtQuick::MouseArea::onExited() This handler is called when the mouse exits the mouse area. @@ -309,7 +309,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onPositionChanged(MouseEvent mouse) + \qmlsignal QtQuick::MouseArea::onPositionChanged(MouseEvent mouse) This handler is called when the mouse position changes. @@ -324,7 +324,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onClicked(MouseEvent mouse) + \qmlsignal QtQuick::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 @@ -337,7 +337,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onPressed(MouseEvent mouse) + \qmlsignal QtQuick::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 @@ -351,7 +351,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onReleased(MouseEvent mouse) + \qmlsignal QtQuick::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 @@ -363,7 +363,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onPressAndHold(MouseEvent mouse) + \qmlsignal QtQuick::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 @@ -373,7 +373,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onDoubleClicked(MouseEvent mouse) + \qmlsignal QtQuick::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 @@ -385,7 +385,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onCanceled() + \qmlsignal QtQuick::MouseArea::onCanceled() This handler is called when mouse events have been canceled, either because an event was not accepted, or because another item stole the mouse event handling. @@ -399,7 +399,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i */ /*! - \qmlsignal QtQuick2::MouseArea::onWheel(WheelEvent wheel) + \qmlsignal QtQuick::MouseArea::onWheel(WheelEvent wheel) This handler is called in response to both mouse wheel and trackpad scroll gestures. @@ -426,8 +426,8 @@ QQuickMouseArea::~QQuickMouseArea() } /*! - \qmlproperty real QtQuick2::MouseArea::mouseX - \qmlproperty real QtQuick2::MouseArea::mouseY + \qmlproperty real QtQuick::MouseArea::mouseX + \qmlproperty real QtQuick::MouseArea::mouseY These properties hold the coordinates of the mouse cursor. If the hoverEnabled property is false then these properties will only be valid @@ -457,7 +457,7 @@ qreal QQuickMouseArea::mouseY() const } /*! - \qmlproperty bool QtQuick2::MouseArea::enabled + \qmlproperty bool QtQuick::MouseArea::enabled This property holds whether the item accepts mouse events. By default, this property is true. @@ -478,7 +478,7 @@ void QQuickMouseArea::setEnabled(bool a) } /*! - \qmlproperty bool QtQuick2::MouseArea::preventStealing + \qmlproperty bool QtQuick::MouseArea::preventStealing This property holds whether the mouse events may be stolen from this MouseArea. @@ -511,7 +511,7 @@ void QQuickMouseArea::setPreventStealing(bool prevent) /*! - \qmlproperty bool QtQuick2::MouseArea::propagateComposedEvents + \qmlproperty bool QtQuick::MouseArea::propagateComposedEvents This property holds whether composed mouse events will automatically propagate to other MouseAreas that overlap with this MouseArea but are lower in the visual stacking order. By default, this property is false. @@ -587,7 +587,7 @@ void QQuickMouseArea::setPropagateComposedEvents(bool prevent) } /*! - \qmlproperty MouseButtons QtQuick2::MouseArea::pressedButtons + \qmlproperty MouseButtons QtQuick::MouseArea::pressedButtons This property holds the mouse buttons currently pressed. It contains a bitwise combination of: @@ -978,7 +978,7 @@ void QQuickMouseArea::itemChange(ItemChange change, const ItemChangeData &value) } /*! - \qmlproperty bool QtQuick2::MouseArea::hoverEnabled + \qmlproperty bool QtQuick::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 @@ -1004,7 +1004,7 @@ void QQuickMouseArea::setHoverEnabled(bool h) /*! - \qmlproperty bool QtQuick2::MouseArea::containsMouse + \qmlproperty bool QtQuick::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. @@ -1017,7 +1017,7 @@ bool QQuickMouseArea::hovered() const } /*! - \qmlproperty bool QtQuick2::MouseArea::pressed + \qmlproperty bool QtQuick::MouseArea::pressed This property holds whether any of the \l acceptedButtons are currently pressed. */ bool QQuickMouseArea::pressed() const @@ -1037,7 +1037,7 @@ void QQuickMouseArea::setHovered(bool h) } /*! - \qmlproperty Qt::MouseButtons QtQuick2::MouseArea::acceptedButtons + \qmlproperty Qt::MouseButtons QtQuick::MouseArea::acceptedButtons This property holds the mouse buttons that the mouse area reacts to. To specify that the MouseArea will react to multiple buttons, @@ -1117,7 +1117,7 @@ bool QQuickMouseArea::setPressed(Qt::MouseButton button, bool p) /*! - \qmlproperty Qt::CursorShape QtQuick2::MouseArea::cursorShape + \qmlproperty Qt::CursorShape QtQuick::MouseArea::cursorShape This property holds the cursor shape for this mouse area. Note that on platforms that do not display a mouse cursor this may have no effect. @@ -1178,15 +1178,15 @@ void QQuickMouseArea::setCursorShape(Qt::CursorShape shape) #endif /*! - \qmlproperty Item QtQuick2::MouseArea::drag.target - \qmlproperty bool QtQuick2::MouseArea::drag.active - \qmlproperty enumeration QtQuick2::MouseArea::drag.axis - \qmlproperty real QtQuick2::MouseArea::drag.minimumX - \qmlproperty real QtQuick2::MouseArea::drag.maximumX - \qmlproperty real QtQuick2::MouseArea::drag.minimumY - \qmlproperty real QtQuick2::MouseArea::drag.maximumY - \qmlproperty bool QtQuick2::MouseArea::drag.filterChildren - \qmlproperty real QtQuick2::MouseArea::drag.threshold + \qmlproperty Item QtQuick::MouseArea::drag.target + \qmlproperty bool QtQuick::MouseArea::drag.active + \qmlproperty enumeration QtQuick::MouseArea::drag.axis + \qmlproperty real QtQuick::MouseArea::drag.minimumX + \qmlproperty real QtQuick::MouseArea::drag.maximumX + \qmlproperty real QtQuick::MouseArea::drag.minimumY + \qmlproperty real QtQuick::MouseArea::drag.maximumY + \qmlproperty bool QtQuick::MouseArea::drag.filterChildren + \qmlproperty real QtQuick::MouseArea::drag.threshold \c drag provides a convenient way to make an item draggable. diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 75e0884378..8fe306b006 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -65,7 +65,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlVisualTouchDebugging, QML_VISUAL_TOUCH_DEBUGGING) */ /*! - \qmlproperty int QtQuick2::TouchPoint::pointId + \qmlproperty int QtQuick::TouchPoint::pointId This property holds the point id of the touch point. @@ -80,8 +80,8 @@ void QQuickTouchPoint::setPointId(int id) } /*! - \qmlproperty real QtQuick2::TouchPoint::x - \qmlproperty real QtQuick2::TouchPoint::y + \qmlproperty real QtQuick::TouchPoint::x + \qmlproperty real QtQuick::TouchPoint::y These properties hold the current position of the touch point. */ @@ -103,9 +103,9 @@ void QQuickTouchPoint::setY(qreal y) } /*! - \qmlproperty real QtQuick2::TouchPoint::pressure - \qmlproperty vector2d QtQuick2::TouchPoint::velocity - \qmlproperty rectangle QtQuick2::TouchPoint::area + \qmlproperty real QtQuick::TouchPoint::pressure + \qmlproperty vector2d QtQuick::TouchPoint::velocity + \qmlproperty rectangle QtQuick::TouchPoint::area These properties hold additional information about the current state of the touch point. @@ -143,7 +143,7 @@ void QQuickTouchPoint::setArea(const QRectF &area) } /*! - \qmlproperty bool QtQuick2::TouchPoint::pressed + \qmlproperty bool QtQuick::TouchPoint::pressed This property holds whether the touch point is currently pressed. */ @@ -156,8 +156,8 @@ void QQuickTouchPoint::setPressed(bool pressed) } /*! - \qmlproperty real QtQuick2::TouchPoint::startX - \qmlproperty real QtQuick2::TouchPoint::startY + \qmlproperty real QtQuick::TouchPoint::startX + \qmlproperty real QtQuick::TouchPoint::startY These properties hold the starting position of the touch point. */ @@ -179,8 +179,8 @@ void QQuickTouchPoint::setStartY(qreal startY) } /*! - \qmlproperty real QtQuick2::TouchPoint::previousX - \qmlproperty real QtQuick2::TouchPoint::previousY + \qmlproperty real QtQuick::TouchPoint::previousX + \qmlproperty real QtQuick::TouchPoint::previousY These properties hold the previous position of the touch point. */ @@ -201,8 +201,8 @@ void QQuickTouchPoint::setPreviousY(qreal previousY) } /*! - \qmlproperty real QtQuick2::TouchPoint::sceneX - \qmlproperty real QtQuick2::TouchPoint::sceneY + \qmlproperty real QtQuick::TouchPoint::sceneX + \qmlproperty real QtQuick::TouchPoint::sceneY These properties hold the current position of the touch point in scene coordinates. */ @@ -251,7 +251,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY) */ /*! - \qmlsignal QtQuick2::MultiPointTouchArea::onPressed(list<TouchPoint> touchPoints) + \qmlsignal QtQuick::MultiPointTouchArea::onPressed(list<TouchPoint> touchPoints) This handler is called when new touch points are added. \a touchPoints is a list of these new points. @@ -260,19 +260,19 @@ void QQuickTouchPoint::setSceneY(qreal sceneY) */ /*! - \qmlsignal QtQuick2::MultiPointTouchArea::onUpdated(list<TouchPoint> touchPoints) + \qmlsignal QtQuick::MultiPointTouchArea::onUpdated(list<TouchPoint> touchPoints) This handler is called when existing touch points are updated. \a touchPoints is a list of these updated points. */ /*! - \qmlsignal QtQuick2::MultiPointTouchArea::onReleased(list<TouchPoint> touchPoints) + \qmlsignal QtQuick::MultiPointTouchArea::onReleased(list<TouchPoint> touchPoints) This handler is called when existing touch points are removed. \a touchPoints is a list of these removed points. */ /*! - \qmlsignal QtQuick2::MultiPointTouchArea::onCanceled(list<TouchPoint> touchPoints) + \qmlsignal QtQuick::MultiPointTouchArea::onCanceled(list<TouchPoint> touchPoints) This handler is called when new touch events have been canceled because another item stole the touch event handling. @@ -287,7 +287,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY) */ /*! - \qmlsignal QtQuick2::MultiPointTouchArea::onGestureStarted(GestureEvent gesture) + \qmlsignal QtQuick::MultiPointTouchArea::onGestureStarted(GestureEvent gesture) This handler is called when the global drag threshold has been reached. @@ -300,7 +300,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY) */ /*! - \qmlsignal QtQuick2::MultiPointTouchArea::onTouchUpdated(list<TouchPoint> touchPoints) + \qmlsignal QtQuick::MultiPointTouchArea::onTouchUpdated(list<TouchPoint> touchPoints) This handler is called when the touch points handled by the MultiPointTouchArea change. This includes adding new touch points, removing or canceling previous touch points, as well as updating current touch point data. \a touchPoints is the list of all current touch @@ -308,7 +308,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY) */ /*! - \qmlproperty list<TouchPoint> QtQuick2::MultiPointTouchArea::touchPoints + \qmlproperty list<TouchPoint> QtQuick::MultiPointTouchArea::touchPoints This property holds a set of user-defined touch point objects that can be bound to. @@ -349,8 +349,8 @@ QQuickMultiPointTouchArea::~QQuickMultiPointTouchArea() } /*! - \qmlproperty int QtQuick2::MultiPointTouchArea::minimumTouchPoints - \qmlproperty int QtQuick2::MultiPointTouchArea::maximumTouchPoints + \qmlproperty int QtQuick::MultiPointTouchArea::minimumTouchPoints + \qmlproperty int QtQuick::MultiPointTouchArea::maximumTouchPoints These properties hold the range of touch points to be handled by the touch area. diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index 823885c089..ff31d9de4e 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -574,14 +574,14 @@ QQuickPathView::~QQuickPathView() } /*! - \qmlattachedproperty PathView QtQuick2::PathView::view + \qmlattachedproperty PathView QtQuick::PathView::view This attached property holds the view that manages this delegate instance. It is attached to each instance of the delegate. */ /*! - \qmlattachedproperty bool QtQuick2::PathView::onPath + \qmlattachedproperty bool QtQuick::PathView::onPath This attached property holds whether the item is currently on the path. If a pathItemCount has been set, it is possible that some items may @@ -601,7 +601,7 @@ QQuickPathView::~QQuickPathView() */ /*! - \qmlattachedproperty bool QtQuick2::PathView::isCurrentItem + \qmlattachedproperty bool QtQuick::PathView::isCurrentItem This attached property is true if this delegate is the current item; otherwise false. It is attached to each instance of the delegate. @@ -612,7 +612,7 @@ QQuickPathView::~QQuickPathView() */ /*! - \qmlproperty model QtQuick2::PathView::model + \qmlproperty model QtQuick::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. @@ -692,7 +692,7 @@ void QQuickPathView::setModel(const QVariant &model) } /*! - \qmlproperty int QtQuick2::PathView::count + \qmlproperty int QtQuick::PathView::count This property holds the number of items in the model. */ int QQuickPathView::count() const @@ -702,7 +702,7 @@ int QQuickPathView::count() const } /*! - \qmlproperty Path QtQuick2::PathView::path + \qmlproperty Path QtQuick::PathView::path This property holds the path used to lay out the items. For more information see the \l Path documentation. */ @@ -735,7 +735,7 @@ void QQuickPathView::setPath(QQuickPath *path) } /*! - \qmlproperty int QtQuick2::PathView::currentIndex + \qmlproperty int QtQuick::PathView::currentIndex This property holds the index of the current item. */ int QQuickPathView::currentIndex() const @@ -784,7 +784,7 @@ void QQuickPathView::setCurrentIndex(int idx) } /*! - \qmlproperty Item QtQuick2::PathView::currentItem + \qmlproperty Item QtQuick::PathView::currentItem This property holds the current item in the view. */ QQuickItem *QQuickPathView::currentItem() const @@ -794,7 +794,7 @@ QQuickItem *QQuickPathView::currentItem() const } /*! - \qmlmethod QtQuick2::PathView::incrementCurrentIndex() + \qmlmethod QtQuick::PathView::incrementCurrentIndex() Increments the current index. @@ -808,7 +808,7 @@ void QQuickPathView::incrementCurrentIndex() } /*! - \qmlmethod QtQuick2::PathView::decrementCurrentIndex() + \qmlmethod QtQuick::PathView::decrementCurrentIndex() Decrements the current index. @@ -822,7 +822,7 @@ void QQuickPathView::decrementCurrentIndex() } /*! - \qmlproperty real QtQuick2::PathView::offset + \qmlproperty real QtQuick::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. @@ -863,7 +863,7 @@ void QQuickPathViewPrivate::setAdjustedOffset(qreal o) } /*! - \qmlproperty Component QtQuick2::PathView::highlight + \qmlproperty Component QtQuick::PathView::highlight This property holds the component to use as the highlight. An instance of the highlight component will be created for each view. @@ -904,7 +904,7 @@ void QQuickPathView::setHighlight(QQmlComponent *highlight) } /*! - \qmlproperty Item QtQuick2::PathView::highlightItem + \qmlproperty Item QtQuick::PathView::highlightItem \c highlightItem holds the highlight item, which was created from the \l highlight component. @@ -917,9 +917,9 @@ QQuickItem *QQuickPathView::highlightItem() return d->highlightItem; } /*! - \qmlproperty real QtQuick2::PathView::preferredHighlightBegin - \qmlproperty real QtQuick2::PathView::preferredHighlightEnd - \qmlproperty enumeration QtQuick2::PathView::highlightRangeMode + \qmlproperty real QtQuick::PathView::preferredHighlightBegin + \qmlproperty real QtQuick::PathView::preferredHighlightEnd + \qmlproperty enumeration QtQuick::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. @@ -1011,7 +1011,7 @@ void QQuickPathView::setHighlightRangeMode(HighlightRangeMode mode) } /*! - \qmlproperty int QtQuick2::PathView::highlightMoveDuration + \qmlproperty int QtQuick::PathView::highlightMoveDuration This property holds the move animation duration of the highlight delegate. If the highlightRangeMode is StrictlyEnforceRange then this property @@ -1035,7 +1035,7 @@ void QQuickPathView::setHighlightMoveDuration(int duration) } /*! - \qmlproperty real QtQuick2::PathView::dragMargin + \qmlproperty real QtQuick::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 @@ -1058,7 +1058,7 @@ void QQuickPathView::setDragMargin(qreal dragMargin) } /*! - \qmlproperty real QtQuick2::PathView::flickDeceleration + \qmlproperty real QtQuick::PathView::flickDeceleration This property holds the rate at which a flick will decelerate. The default is 100. @@ -1079,7 +1079,7 @@ void QQuickPathView::setFlickDeceleration(qreal dec) } /*! - \qmlproperty real QtQuick2::PathView::maximumFlickVelocity + \qmlproperty real QtQuick::PathView::maximumFlickVelocity This property holds the approximate maximum velocity that the user can flick the view in pixels/second. The default value is platform dependent. @@ -1101,7 +1101,7 @@ void QQuickPathView::setMaximumFlickVelocity(qreal vel) /*! - \qmlproperty bool QtQuick2::PathView::interactive + \qmlproperty bool QtQuick::PathView::interactive A user cannot drag or flick a PathView that is not interactive. @@ -1126,7 +1126,7 @@ void QQuickPathView::setInteractive(bool interactive) } /*! - \qmlproperty bool QtQuick2::PathView::moving + \qmlproperty bool QtQuick::PathView::moving This property holds whether the view is currently moving due to the user either dragging or flicking the view. @@ -1138,7 +1138,7 @@ bool QQuickPathView::isMoving() const } /*! - \qmlproperty bool QtQuick2::PathView::flicking + \qmlproperty bool QtQuick::PathView::flicking This property holds whether the view is currently moving due to the user flicking the view. @@ -1150,7 +1150,7 @@ bool QQuickPathView::isFlicking() const } /*! - \qmlproperty bool QtQuick2::PathView::dragging + \qmlproperty bool QtQuick::PathView::dragging This property holds whether the view is currently moving due to the user dragging the view. @@ -1162,14 +1162,14 @@ bool QQuickPathView::isDragging() const } /*! - \qmlsignal QtQuick2::PathView::onMovementStarted() + \qmlsignal QtQuick::PathView::onMovementStarted() This handler is called when the view begins moving due to user interaction. */ /*! - \qmlsignal QtQuick2::PathView::onMovementEnded() + \qmlsignal QtQuick::PathView::onMovementEnded() This handler is called when the view stops moving due to user interaction. If a flick was generated, this handler will @@ -1179,7 +1179,7 @@ bool QQuickPathView::isDragging() const */ /*! - \qmlsignal QtQuick2::PathView::onFlickStarted() + \qmlsignal QtQuick::PathView::onFlickStarted() This handler is called when the view is flicked. A flick starts from the point that the mouse or touch is released, @@ -1187,20 +1187,20 @@ bool QQuickPathView::isDragging() const */ /*! - \qmlsignal QtQuick2::PathView::onFlickEnded() + \qmlsignal QtQuick::PathView::onFlickEnded() This handler is called when the view stops moving due to a flick. */ /*! - \qmlsignal QtQuick2::PathView::onDragStarted() + \qmlsignal QtQuick::PathView::onDragStarted() This handler is called when the view starts to be dragged due to user interaction. */ /*! - \qmlsignal QtQuick2::PathView::onDragEnded() + \qmlsignal QtQuick::PathView::onDragEnded() This handler is called when the user stops dragging the view. @@ -1209,7 +1209,7 @@ bool QQuickPathView::isDragging() const */ /*! - \qmlproperty Component QtQuick2::PathView::delegate + \qmlproperty Component QtQuick::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 @@ -1259,7 +1259,7 @@ void QQuickPathView::setDelegate(QQmlComponent *delegate) } /*! - \qmlproperty int QtQuick2::PathView::pathItemCount + \qmlproperty int QtQuick::PathView::pathItemCount This property holds the number of items visible on the path at any one time. Setting pathItemCount to undefined will show all items on the path. @@ -1298,7 +1298,7 @@ void QQuickPathView::resetPathItemCount() } /*! - \qmlproperty int QtQuick2::PathView::cacheItemCount + \qmlproperty int QtQuick::PathView::cacheItemCount This property holds the maximum number of items to cache off the path. For example, a PathView with a model containing 20 items, a pathItemCount @@ -1335,7 +1335,7 @@ void QQuickPathView::setCacheItemCount(int i) } /*! - \qmlproperty enumeration QtQuick2::PathView::snapMode + \qmlproperty enumeration QtQuick::PathView::snapMode This property determines how the items will settle following a drag or flick. The possible values are: @@ -1370,7 +1370,7 @@ void QQuickPathView::setSnapMode(SnapMode mode) } /*! - \qmlmethod QtQuick2::PathView::positionViewAtIndex(int index, PositionMode mode) + \qmlmethod QtQuick::PathView::positionViewAtIndex(int index, PositionMode mode) Positions the view such that the \a index is at the position specified by \a mode: @@ -1458,7 +1458,7 @@ void QQuickPathView::positionViewAtIndex(int index, int mode) } /*! - \qmlmethod int QtQuick2::PathView::indexAt(int x, int y) + \qmlmethod int QtQuick::PathView::indexAt(int x, int y) Returns the index of the item containing the point \a x, \a y in content coordinates. If there is no item at the point specified, -1 is returned. @@ -1482,7 +1482,7 @@ int QQuickPathView::indexAt(qreal x, qreal y) const } /*! - \qmlmethod Item QtQuick2::PathView::itemAt(int x, int y) + \qmlmethod Item QtQuick::PathView::itemAt(int x, int y) Returns the item containing the point \a x, \a y in content coordinates. If there is no item at the point specified, null is returned. diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp index 0f68494312..eadf82f888 100644 --- a/src/quick/items/qquickpincharea.cpp +++ b/src/quick/items/qquickpincharea.cpp @@ -76,9 +76,9 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty QPointF QtQuick2::PinchEvent::center - \qmlproperty QPointF QtQuick2::PinchEvent::startCenter - \qmlproperty QPointF QtQuick2::PinchEvent::previousCenter + \qmlproperty QPointF QtQuick::PinchEvent::center + \qmlproperty QPointF QtQuick::PinchEvent::startCenter + \qmlproperty QPointF QtQuick::PinchEvent::previousCenter These properties hold the position of the center point between the two touch points. @@ -90,8 +90,8 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty real QtQuick2::PinchEvent::scale - \qmlproperty real QtQuick2::PinchEvent::previousScale + \qmlproperty real QtQuick::PinchEvent::scale + \qmlproperty real QtQuick::PinchEvent::previousScale These properties hold the scale factor determined by the change in distance between the two touch points. @@ -104,9 +104,9 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty real QtQuick2::PinchEvent::angle - \qmlproperty real QtQuick2::PinchEvent::previousAngle - \qmlproperty real QtQuick2::PinchEvent::rotation + \qmlproperty real QtQuick::PinchEvent::angle + \qmlproperty real QtQuick::PinchEvent::previousAngle + \qmlproperty real QtQuick::PinchEvent::rotation These properties hold the angle between the two touch points. @@ -120,10 +120,10 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty QPointF QtQuick2::PinchEvent::point1 - \qmlproperty QPointF QtQuick2::PinchEvent::startPoint1 - \qmlproperty QPointF QtQuick2::PinchEvent::point2 - \qmlproperty QPointF QtQuick2::PinchEvent::startPoint2 + \qmlproperty QPointF QtQuick::PinchEvent::point1 + \qmlproperty QPointF QtQuick::PinchEvent::startPoint1 + \qmlproperty QPointF QtQuick::PinchEvent::point2 + \qmlproperty QPointF QtQuick::PinchEvent::startPoint2 These properties provide the actual touch points generating the pinch. @@ -134,7 +134,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool QtQuick2::PinchEvent::accepted + \qmlproperty bool QtQuick::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 @@ -142,7 +142,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty int QtQuick2::PinchEvent::pointCount + \qmlproperty int QtQuick::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 @@ -190,7 +190,7 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate() */ /*! - \qmlsignal QtQuick2::PinchArea::onPinchStarted() + \qmlsignal QtQuick::PinchArea::onPinchStarted() This handler is called when the pinch area detects that a pinch gesture has started. @@ -202,7 +202,7 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate() */ /*! - \qmlsignal QtQuick2::PinchArea::onPinchUpdated() + \qmlsignal QtQuick::PinchArea::onPinchUpdated() This handler is called when the pinch area detects that a pinch gesture has changed. @@ -211,7 +211,7 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate() */ /*! - \qmlsignal QtQuick2::PinchArea::onPinchFinished() + \qmlsignal QtQuick::PinchArea::onPinchFinished() This handler is called when the pinch area detects that a pinch gesture has finished. @@ -221,17 +221,17 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate() /*! - \qmlproperty Item QtQuick2::PinchArea::pinch.target - \qmlproperty bool QtQuick2::PinchArea::pinch.active - \qmlproperty real QtQuick2::PinchArea::pinch.minimumScale - \qmlproperty real QtQuick2::PinchArea::pinch.maximumScale - \qmlproperty real QtQuick2::PinchArea::pinch.minimumRotation - \qmlproperty real QtQuick2::PinchArea::pinch.maximumRotation - \qmlproperty enumeration QtQuick2::PinchArea::pinch.dragAxis - \qmlproperty real QtQuick2::PinchArea::pinch.minimumX - \qmlproperty real QtQuick2::PinchArea::pinch.maximumX - \qmlproperty real QtQuick2::PinchArea::pinch.minimumY - \qmlproperty real QtQuick2::PinchArea::pinch.maximumY + \qmlproperty Item QtQuick::PinchArea::pinch.target + \qmlproperty bool QtQuick::PinchArea::pinch.active + \qmlproperty real QtQuick::PinchArea::pinch.minimumScale + \qmlproperty real QtQuick::PinchArea::pinch.maximumScale + \qmlproperty real QtQuick::PinchArea::pinch.minimumRotation + \qmlproperty real QtQuick::PinchArea::pinch.maximumRotation + \qmlproperty enumeration QtQuick::PinchArea::pinch.dragAxis + \qmlproperty real QtQuick::PinchArea::pinch.minimumX + \qmlproperty real QtQuick::PinchArea::pinch.maximumX + \qmlproperty real QtQuick::PinchArea::pinch.minimumY + \qmlproperty real QtQuick::PinchArea::pinch.maximumY \c pinch provides a convenient way to make an item react to pinch gestures. @@ -262,7 +262,7 @@ QQuickPinchArea::~QQuickPinchArea() { } /*! - \qmlproperty bool QtQuick2::PinchArea::enabled + \qmlproperty bool QtQuick::PinchArea::enabled This property holds whether the item accepts pinch gestures. This property defaults to true. diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index 0bd590fcb0..fc2b9772d7 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -557,7 +557,7 @@ QQuickPositionerAttached::QQuickPositionerAttached(QObject *parent) : QObject(pa } /*! - \qmlattachedproperty int QtQuick2::Positioner::index + \qmlattachedproperty int QtQuick::Positioner::index This property allows the item to determine its index within the positioner. @@ -571,8 +571,8 @@ void QQuickPositionerAttached::setIndex(int index) } /*! - \qmlattachedproperty bool QtQuick2::Positioner::isFirstItem - \qmlattachedproperty bool QtQuick2::Positioner::isLastItem + \qmlattachedproperty bool QtQuick::Positioner::isFirstItem + \qmlattachedproperty bool QtQuick::Positioner::isLastItem These properties allow the item to determine if it is the first or last item in the positioner, respectively. @@ -647,7 +647,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) \sa Row, Grid, Flow, Positioner, ColumnLayout, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Column::populate + \qmlproperty Transition QtQuick::Column::populate This property holds the transition to be run for items that are part of this positioner at the time of its creation. The transition is run when the positioner @@ -660,7 +660,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) \sa add, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Column::add + \qmlproperty Transition QtQuick::Column::add This property holds the transition to be run for items that are added to this positioner. For a positioner, this applies to: @@ -682,7 +682,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) \sa populate, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Column::move + \qmlproperty Transition QtQuick::Column::move This property holds the transition to run for items that have moved within the positioner. For a positioner, this applies to: @@ -707,7 +707,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) \sa add, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty real QtQuick2::Column::spacing + \qmlproperty real QtQuick::Column::spacing The spacing is the amount in pixels left empty between adjacent items. The default spacing is 0. @@ -801,7 +801,7 @@ void QQuickColumn::reportConflictingAnchors() \sa Column, Grid, Flow, Positioner, RowLayout, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Row::populate + \qmlproperty Transition QtQuick::Row::populate This property holds the transition to be run for items that are part of this positioner at the time of its creation. The transition is run when the positioner @@ -814,7 +814,7 @@ void QQuickColumn::reportConflictingAnchors() \sa add, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Row::add + \qmlproperty Transition QtQuick::Row::add This property holds the transition to be run for items that are added to this positioner. For a positioner, this applies to: @@ -836,7 +836,7 @@ void QQuickColumn::reportConflictingAnchors() \sa populate, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Row::move + \qmlproperty Transition QtQuick::Row::move This property holds the transition to run for items that have moved within the positioner. For a positioner, this applies to: @@ -861,7 +861,7 @@ void QQuickColumn::reportConflictingAnchors() \sa add, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty real QtQuick2::Row::spacing + \qmlproperty real QtQuick::Row::spacing The spacing is the amount in pixels left empty between adjacent items. The default spacing is 0. @@ -874,7 +874,7 @@ QQuickRow::QQuickRow(QQuickItem *parent) { } /*! - \qmlproperty enumeration QtQuick2::Row::layoutDirection + \qmlproperty enumeration QtQuick::Row::layoutDirection This property holds the layoutDirection of the row. @@ -911,7 +911,7 @@ void QQuickRow::setLayoutDirection(Qt::LayoutDirection layoutDirection) } } /*! - \qmlproperty enumeration QtQuick2::Row::effectiveLayoutDirection + \qmlproperty enumeration QtQuick::Row::effectiveLayoutDirection This property holds the effective layout direction of the row. When using the attached property \l {LayoutMirroring::enabled}{LayoutMirroring::enabled} for locale layouts, @@ -1034,7 +1034,7 @@ void QQuickRow::reportConflictingAnchors() \sa Flow, Row, Column, Positioner, GridLayout, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Grid::populate + \qmlproperty Transition QtQuick::Grid::populate This property holds the transition to be run for items that are part of this positioner at the time of its creation. The transition is run when the positioner @@ -1047,7 +1047,7 @@ void QQuickRow::reportConflictingAnchors() \sa add, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Grid::add + \qmlproperty Transition QtQuick::Grid::add This property holds the transition to be run for items that are added to this positioner. For a positioner, this applies to: @@ -1069,7 +1069,7 @@ void QQuickRow::reportConflictingAnchors() \sa populate, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Grid::move + \qmlproperty Transition QtQuick::Grid::move This property holds the transition to run for items that have moved within the positioner. For a positioner, this applies to: @@ -1094,7 +1094,7 @@ void QQuickRow::reportConflictingAnchors() \sa add, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty qreal QtQuick2::Grid::spacing + \qmlproperty qreal QtQuick::Grid::spacing The spacing is the amount in pixels left empty between adjacent items. The amount of spacing applied will be the same in the @@ -1126,7 +1126,7 @@ QQuickGrid::QQuickGrid(QQuickItem *parent) } /*! - \qmlproperty int QtQuick2::Grid::columns + \qmlproperty int QtQuick::Grid::columns This property holds the number of columns in the grid. The default number of columns is 4. @@ -1136,7 +1136,7 @@ QQuickGrid::QQuickGrid(QQuickItem *parent) */ /*! - \qmlproperty int QtQuick2::Grid::rows + \qmlproperty int QtQuick::Grid::rows This property holds the number of rows in the grid. If the grid does not have enough items to fill the specified @@ -1162,7 +1162,7 @@ void QQuickGrid::setRows(const int rows) } /*! - \qmlproperty enumeration QtQuick2::Grid::flow + \qmlproperty enumeration QtQuick::Grid::flow This property holds the flow of the layout. Possible values are: @@ -1189,7 +1189,7 @@ void QQuickGrid::setFlow(Flow flow) } /*! - \qmlproperty qreal QtQuick2::Grid::rowSpacing + \qmlproperty qreal QtQuick::Grid::rowSpacing This property holds the spacing in pixels between rows. @@ -1211,7 +1211,7 @@ void QQuickGrid::setRowSpacing(const qreal rowSpacing) } /*! - \qmlproperty qreal QtQuick2::Grid::columnSpacing + \qmlproperty qreal QtQuick::Grid::columnSpacing This property holds the spacing in pixels between columns. @@ -1233,7 +1233,7 @@ void QQuickGrid::setColumnSpacing(const qreal columnSpacing) } /*! - \qmlproperty enumeration QtQuick2::Grid::layoutDirection + \qmlproperty enumeration QtQuick::Grid::layoutDirection This property holds the layout direction of the layout. @@ -1273,7 +1273,7 @@ void QQuickGrid::setLayoutDirection(Qt::LayoutDirection layoutDirection) } /*! - \qmlproperty enumeration QtQuick2::Grid::effectiveLayoutDirection + \qmlproperty enumeration QtQuick::Grid::effectiveLayoutDirection This property holds the effective layout direction of the grid. When using the attached property \l {LayoutMirroring::enabled}{LayoutMirroring::enabled} for locale layouts, @@ -1288,9 +1288,9 @@ Qt::LayoutDirection QQuickGrid::effectiveLayoutDirection() const } /*! - \qmlproperty enumeration QtQuick2::Grid::horizontalItmeAlignment - \qmlproperty enumeration QtQuick2::Grid::verticalItemAlignment - \qmlproperty enumeration QtQuick2::Grid::effectiveHorizontalItemAlignment + \qmlproperty enumeration QtQuick::Grid::horizontalItmeAlignment + \qmlproperty enumeration QtQuick::Grid::verticalItemAlignment + \qmlproperty enumeration QtQuick::Grid::effectiveHorizontalItemAlignment Sets the horizontal and vertical alignment of items in the Grid. By default, the items are vertically aligned to the top. Horizontal @@ -1575,7 +1575,7 @@ void QQuickGrid::reportConflictingAnchors() \sa Column, Row, Grid, Positioner, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Flow::populate + \qmlproperty Transition QtQuick::Flow::populate This property holds the transition to be run for items that are part of this positioner at the time of its creation. The transition is run when the positioner @@ -1588,7 +1588,7 @@ void QQuickGrid::reportConflictingAnchors() \sa add, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Flow::add + \qmlproperty Transition QtQuick::Flow::add This property holds the transition to be run for items that are added to this positioner. For a positioner, this applies to: @@ -1610,7 +1610,7 @@ void QQuickGrid::reportConflictingAnchors() \sa populate, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty Transition QtQuick2::Flow::move + \qmlproperty Transition QtQuick::Flow::move This property holds the transition to run for items that have moved within the positioner. For a positioner, this applies to: @@ -1635,7 +1635,7 @@ void QQuickGrid::reportConflictingAnchors() \sa add, ViewTransition, {Qt Quick Examples - Positioners} */ /*! - \qmlproperty real QtQuick2::Flow::spacing + \qmlproperty real QtQuick::Flow::spacing spacing is the amount in pixels left empty between each adjacent item, and defaults to 0. @@ -1664,7 +1664,7 @@ QQuickFlow::QQuickFlow(QQuickItem *parent) } /*! - \qmlproperty enumeration QtQuick2::Flow::flow + \qmlproperty enumeration QtQuick::Flow::flow This property holds the flow of the layout. Possible values are: @@ -1695,7 +1695,7 @@ void QQuickFlow::setFlow(Flow flow) } /*! - \qmlproperty enumeration QtQuick2::Flow::layoutDirection + \qmlproperty enumeration QtQuick::Flow::layoutDirection This property holds the layout direction of the layout. @@ -1731,7 +1731,7 @@ void QQuickFlow::setLayoutDirection(Qt::LayoutDirection layoutDirection) } /*! - \qmlproperty enumeration QtQuick2::Flow::effectiveLayoutDirection + \qmlproperty enumeration QtQuick::Flow::effectiveLayoutDirection This property holds the effective layout direction of the flow. When using the attached property \l {LayoutMirroring::enabled}{LayoutMirroring::enabled} for locale layouts, diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp index f36e511e62..dd482eddb7 100644 --- a/src/quick/items/qquickrectangle.cpp +++ b/src/quick/items/qquickrectangle.cpp @@ -138,8 +138,8 @@ bool QQuickPen::isValid() const */ /*! - \qmlproperty real QtQuick2::GradientStop::position - \qmlproperty color QtQuick2::GradientStop::color + \qmlproperty real QtQuick::GradientStop::position + \qmlproperty color QtQuick::GradientStop::color The position and color properties describe the color used at a given position in a gradient, as represented by a gradient stop. @@ -232,7 +232,7 @@ void QQuickGradientStop::updateGradient() */ /*! - \qmlproperty list<GradientStop> QtQuick2::Gradient::stops + \qmlproperty list<GradientStop> QtQuick::Gradient::stops \default This property holds the gradient stops describing the gradient. @@ -321,8 +321,8 @@ void QQuickRectangle::doUpdate() } /*! - \qmlproperty int QtQuick2::Rectangle::border.width - \qmlproperty color QtQuick2::Rectangle::border.color + \qmlproperty int QtQuick::Rectangle::border.width + \qmlproperty color QtQuick::Rectangle::border.color The width and color used to draw the border of the rectangle. @@ -340,7 +340,7 @@ QQuickPen *QQuickRectangle::border() } /*! - \qmlproperty Gradient QtQuick2::Rectangle::gradient + \qmlproperty Gradient QtQuick::Rectangle::gradient The gradient to use to fill the rectangle. @@ -388,7 +388,7 @@ void QQuickRectangle::resetGradient() } /*! - \qmlproperty real QtQuick2::Rectangle::radius + \qmlproperty real QtQuick::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 @@ -413,7 +413,7 @@ void QQuickRectangle::setRadius(qreal radius) } /*! - \qmlproperty color QtQuick2::Rectangle::color + \qmlproperty color QtQuick::Rectangle::color This property holds the color used to fill the rectangle. The default color is white. diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp index 686d7a64af..072bfab73c 100644 --- a/src/quick/items/qquickrepeater.cpp +++ b/src/quick/items/qquickrepeater.cpp @@ -131,7 +131,7 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate() */ /*! - \qmlsignal QtQuick2::Repeater::onItemAdded(int index, Item item) + \qmlsignal QtQuick::Repeater::onItemAdded(int index, Item item) This handler is called when an item is added to the repeater. The \a index parameter holds the index at which the item has been inserted within the @@ -139,7 +139,7 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate() */ /*! - \qmlsignal QtQuick2::Repeater::onItemRemoved(int index, Item item) + \qmlsignal QtQuick::Repeater::onItemRemoved(int index, Item item) This handler is called when an item is removed from the repeater. The \a index parameter holds the index at which the item was removed from the repeater, @@ -158,7 +158,7 @@ QQuickRepeater::~QQuickRepeater() } /*! - \qmlproperty any QtQuick2::Repeater::model + \qmlproperty any QtQuick::Repeater::model The model providing data for the repeater. @@ -235,7 +235,7 @@ void QQuickRepeater::setModel(const QVariant &model) } /*! - \qmlproperty Component QtQuick2::Repeater::delegate + \qmlproperty Component QtQuick::Repeater::delegate \default The delegate provides a template defining each item instantiated by the repeater. @@ -299,7 +299,7 @@ void QQuickRepeater::setDelegate(QQmlComponent *delegate) } /*! - \qmlproperty int QtQuick2::Repeater::count + \qmlproperty int QtQuick::Repeater::count This property holds the number of items in the repeater. */ @@ -312,7 +312,7 @@ int QQuickRepeater::count() const } /*! - \qmlmethod Item QtQuick2::Repeater::itemAt(index) + \qmlmethod Item QtQuick::Repeater::itemAt(index) Returns the \l Item that has been created at the given \a index, or \c null if no item exists at \a index. diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp index b8a2392b95..75eccf6c59 100644 --- a/src/quick/items/qquickscreen.cpp +++ b/src/quick/items/qquickscreen.cpp @@ -80,26 +80,26 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlattachedproperty String QtQuick.Window2::Screen::name + \qmlattachedproperty String QtQuick.Window::Screen::name \readonly \since 5.1 The name of the screen. */ /*! - \qmlattachedproperty int QtQuick.Window2::Screen::width + \qmlattachedproperty int QtQuick.Window::Screen::width \readonly This contains the width of the screen in pixels. */ /*! - \qmlattachedproperty int QtQuick.Window2::Screen::height + \qmlattachedproperty int QtQuick.Window::Screen::height \readonly This contains the height of the screen in pixels. */ /*! - \qmlattachedproperty int QtQuick.Window2::Screen::desktopAvailableWidth + \qmlattachedproperty int QtQuick.Window::Screen::desktopAvailableWidth \readonly \since 5.1 @@ -113,7 +113,7 @@ QT_BEGIN_NAMESPACE \endqml */ /*! - \qmlattachedproperty int QtQuick.Window2::Screen::desktopAvailableHeight + \qmlattachedproperty int QtQuick.Window::Screen::desktopAvailableHeight \readonly \since 5.1 @@ -127,7 +127,7 @@ QT_BEGIN_NAMESPACE \endqml */ /*! - \qmlattachedproperty real QtQuick.Window2::Screen::logicalPixelDensity + \qmlattachedproperty real QtQuick.Window::Screen::logicalPixelDensity \readonly \since 5.1 @@ -136,7 +136,7 @@ QT_BEGIN_NAMESPACE pixels. */ /*! - \qmlattachedproperty Qt::ScreenOrientation QtQuick.Window2::Screen::primaryOrientation + \qmlattachedproperty Qt::ScreenOrientation QtQuick.Window::Screen::primaryOrientation \readonly This contains the primary orientation of the screen. If the @@ -153,7 +153,7 @@ QT_BEGIN_NAMESPACE automatically, so again you will see the primaryOrientation change. */ /*! - \qmlattachedproperty Qt::ScreenOrientation QtQuick.Window2::Screen::orientation + \qmlattachedproperty Qt::ScreenOrientation QtQuick.Window::Screen::orientation \readonly This contains the current orientation of the screen, from the accelerometer @@ -167,7 +167,7 @@ QT_BEGIN_NAMESPACE \l Item.transform to rotate your content. */ /*! - \qmlattachedmethod int QtQuick.Window2::Screen::angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b) + \qmlattachedmethod int QtQuick.Window::Screen::angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b) Returns the rotation angle, in degrees, between the two specified angles. */ diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index 60ac7ac82c..354b9f751b 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -667,7 +667,7 @@ QQuickShaderEffect::~QQuickShaderEffect() } /*! - \qmlproperty string QtQuick2::ShaderEffect::fragmentShader + \qmlproperty string QtQuick::ShaderEffect::fragmentShader This property holds the fragment shader's GLSL source code. The default shader passes the texture coordinate along to the fragment @@ -694,7 +694,7 @@ void QQuickShaderEffect::setFragmentShader(const QByteArray &code) } /*! - \qmlproperty string QtQuick2::ShaderEffect::vertexShader + \qmlproperty string QtQuick::ShaderEffect::vertexShader This property holds the vertex shader's GLSL source code. The default shader expects the texture coordinate to be passed from the @@ -722,7 +722,7 @@ void QQuickShaderEffect::setVertexShader(const QByteArray &code) } /*! - \qmlproperty bool QtQuick2::ShaderEffect::blending + \qmlproperty bool QtQuick::ShaderEffect::blending If this property is true, the output from the \l fragmentShader is blended with the background using source-over blend mode. If false, the background @@ -742,7 +742,7 @@ void QQuickShaderEffect::setBlending(bool enable) } /*! - \qmlproperty variant QtQuick2::ShaderEffect::mesh + \qmlproperty variant QtQuick::ShaderEffect::mesh This property defines the mesh used to draw the ShaderEffect. It can hold any \l GridMesh object. @@ -797,7 +797,7 @@ void QQuickShaderEffect::setMesh(const QVariant &mesh) } /*! - \qmlproperty enumeration QtQuick2::ShaderEffect::cullMode + \qmlproperty enumeration QtQuick::ShaderEffect::cullMode This property defines which sides of the item should be visible. @@ -848,7 +848,7 @@ bool QQuickShaderEffect::event(QEvent *event) } /*! - \qmlproperty enumeration QtQuick2::ShaderEffect::status + \qmlproperty enumeration QtQuick::ShaderEffect::status This property tells the current status of the OpenGL shader program. @@ -866,7 +866,7 @@ bool QQuickShaderEffect::event(QEvent *event) */ /*! - \qmlproperty string QtQuick2::ShaderEffect::log + \qmlproperty string QtQuick::ShaderEffect::log This property holds a log of warnings and errors from the latest attempt at compiling and linking the OpenGL shader program. It is updated at the same time \l status is set to Compiled diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp index 243bff38b3..bc97a424f4 100644 --- a/src/quick/items/qquickshadereffectmesh.cpp +++ b/src/quick/items/qquickshadereffectmesh.cpp @@ -161,7 +161,7 @@ QSGGeometry *QQuickGridMesh::updateGeometry(QSGGeometry *geometry, const QVector } /*! - \qmlproperty size QtQuick2::GridMesh::resolution + \qmlproperty size QtQuick::GridMesh::resolution This property holds the grid resolution. The resolution's width and height specify the number of cells or spacings between vertices horizontally and diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp index 12db6e7a67..e86550d731 100644 --- a/src/quick/items/qquickshadereffectsource.cpp +++ b/src/quick/items/qquickshadereffectsource.cpp @@ -619,7 +619,7 @@ QSGTextureProvider *QQuickShaderEffectSource::textureProvider() const } /*! - \qmlproperty enumeration QtQuick2::ShaderEffectSource::wrapMode + \qmlproperty enumeration QtQuick::ShaderEffectSource::wrapMode This property defines the OpenGL wrap modes associated with the texture. Modifying this property makes most sense when the item is used as a @@ -651,7 +651,7 @@ void QQuickShaderEffectSource::setWrapMode(WrapMode mode) } /*! - \qmlproperty Item QtQuick2::ShaderEffectSource::sourceItem + \qmlproperty Item QtQuick::ShaderEffectSource::sourceItem This property holds the item to be rendered into the texture. Setting this to null while \l live is true, will release the texture @@ -712,7 +712,7 @@ void QQuickShaderEffectSource::sourceItemDestroyed(QObject *item) /*! - \qmlproperty rect QtQuick2::ShaderEffectSource::sourceRect + \qmlproperty rect QtQuick::ShaderEffectSource::sourceRect This property defines which rectangular area of the \l sourceItem to render into the texture. The source rectangle can be larger than @@ -735,7 +735,7 @@ void QQuickShaderEffectSource::setSourceRect(const QRectF &rect) } /*! - \qmlproperty size QtQuick2::ShaderEffectSource::textureSize + \qmlproperty size QtQuick::ShaderEffectSource::textureSize This property holds the requested size of the texture. If it is empty, which is the default, the size of the source rectangle is used. @@ -760,7 +760,7 @@ void QQuickShaderEffectSource::setTextureSize(const QSize &size) } /*! - \qmlproperty enumeration QtQuick2::ShaderEffectSource::format + \qmlproperty enumeration QtQuick::ShaderEffectSource::format This property defines the internal OpenGL format of the texture. Modifying this property makes most sense when the item is used as a @@ -791,7 +791,7 @@ void QQuickShaderEffectSource::setFormat(QQuickShaderEffectSource::Format format } /*! - \qmlproperty bool QtQuick2::ShaderEffectSource::live + \qmlproperty bool QtQuick::ShaderEffectSource::live If this property is true, the texture is updated whenever the \l sourceItem updates. Otherwise, it will be a frozen image, even if @@ -813,7 +813,7 @@ void QQuickShaderEffectSource::setLive(bool live) } /*! - \qmlproperty bool QtQuick2::ShaderEffectSource::hideSource + \qmlproperty bool QtQuick::ShaderEffectSource::hideSource If this property is true, the \l sourceItem is hidden, though it will still be rendered into the texture. As opposed to hiding the \l sourceItem by @@ -842,7 +842,7 @@ void QQuickShaderEffectSource::setHideSource(bool hide) } /*! - \qmlproperty bool QtQuick2::ShaderEffectSource::mipmap + \qmlproperty bool QtQuick::ShaderEffectSource::mipmap If this property is true, mipmaps are generated for the texture. @@ -865,7 +865,7 @@ void QQuickShaderEffectSource::setMipmap(bool enabled) } /*! - \qmlproperty bool QtQuick2::ShaderEffectSource::recursive + \qmlproperty bool QtQuick::ShaderEffectSource::recursive Set this property to true if the ShaderEffectSource has a dependency on itself. ShaderEffectSources form a dependency chain, where one @@ -896,7 +896,7 @@ void QQuickShaderEffectSource::setRecursive(bool enabled) } /*! - \qmlmethod QtQuick2::ShaderEffectSource::scheduleUpdate() + \qmlmethod QtQuick::ShaderEffectSource::scheduleUpdate() Schedules a re-rendering of the texture for the next frame. Use this to update the texture when \l live is false. diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp index ff4b8f0b63..b2bfb69bab 100644 --- a/src/quick/items/qquicksprite.cpp +++ b/src/quick/items/qquicksprite.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE For full details, see the \l{Sprite Animation} overview. */ /*! - \qmlproperty int QtQuick2::Sprite::duration + \qmlproperty int QtQuick::Sprite::duration Duration of the animation. Values below 0 are invalid. @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE If not, and frameDuration is valid, then frameDuration will be used. Otherwise duration is used. */ /*! - \qmlproperty int QtQuick2::Sprite::durationVariation + \qmlproperty int QtQuick::Sprite::durationVariation The duration of the animation can vary by up to this amount. Variation will never decrease the length of the animation to less than 0. @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty qreal QtQuick2::Sprite::frameRate + \qmlproperty qreal QtQuick::Sprite::frameRate Frames per second to show in the animation. Values below 0 are invalid. @@ -87,7 +87,7 @@ QT_BEGIN_NAMESPACE If not, and frameDuration is valid , then frameDuration will be used. Otherwise duration is used. */ /*! - \qmlproperty qreal QtQuick2::Sprite::frameRateVariation + \qmlproperty qreal QtQuick::Sprite::frameRateVariation The frame rate between animations can vary by up to this amount. Variation will never decrease the length of the animation to less than 0. @@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty int QtQuick2::Sprite::frameDuration + \qmlproperty int QtQuick::Sprite::frameDuration Duration of each frame of the animation. Values below 0 are invalid. @@ -107,7 +107,7 @@ QT_BEGIN_NAMESPACE If not, and frameDuration is valid, then frameDuration will be used. Otherwise duration is used. */ /*! - \qmlproperty int QtQuick2::Sprite::frameDurationVariation + \qmlproperty int QtQuick::Sprite::frameDurationVariation The duration of a frame in the animation can vary by up to this amount. Variation will never decrease the length of the animation to less than 0. @@ -119,12 +119,12 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty string QtQuick2::Sprite::name + \qmlproperty string QtQuick::Sprite::name The name of this sprite, for use in the to property of other sprites. */ /*! - \qmlproperty QVariantMap QtQuick2::Sprite::to + \qmlproperty QVariantMap QtQuick::Sprite::to A list of other sprites and weighted transitions to them, for example {"a":1, "b":2, "c":0} would specify that one-third should @@ -138,32 +138,32 @@ QT_BEGIN_NAMESPACE will repeat itself after completing. */ /*! - \qmlproperty int QtQuick2::Sprite::frameCount + \qmlproperty int QtQuick::Sprite::frameCount Number of frames in this sprite. */ /*! - \qmlproperty int QtQuick2::Sprite::frameHeight + \qmlproperty int QtQuick::Sprite::frameHeight Height of a single frame in this sprite. */ /*! - \qmlproperty int QtQuick2::Sprite::frameWidth + \qmlproperty int QtQuick::Sprite::frameWidth Width of a single frame in this sprite. */ /*! - \qmlproperty int QtQuick2::Sprite::frameX + \qmlproperty int QtQuick::Sprite::frameX The X coordinate in the image file of the first frame of the sprite. */ /*! - \qmlproperty int QtQuick2::Sprite::frameY + \qmlproperty int QtQuick::Sprite::frameY The Y coordinate in the image file of the first frame of the sprite. */ /*! - \qmlproperty url QtQuick2::Sprite::source + \qmlproperty url QtQuick::Sprite::source The image source for the animation. @@ -174,7 +174,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool QtQuick2::Sprite::reverse + \qmlproperty bool QtQuick::Sprite::reverse If true, then the animation will be played in reverse. @@ -182,7 +182,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool QtQuick2::Sprite::randomStart + \qmlproperty bool QtQuick::Sprite::randomStart If true, then the animation will start its first animation with a random amount of its duration skipped. This allows them to not look like they all just started when the animation begins. @@ -194,7 +194,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty bool QtQuick2::Sprite::frameSync + \qmlproperty bool QtQuick::Sprite::frameSync If true, then the animation will have no duration. Instead, the animation will advance one frame each time a frame is rendered to the screen. This synchronizes it with the painting diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp index 13816e89a8..3b2b3269e2 100644 --- a/src/quick/items/qquickspritesequence.cpp +++ b/src/quick/items/qquickspritesequence.cpp @@ -220,14 +220,14 @@ struct SpriteVertices { For full details, see the \l{Sprite Animation} overview. */ /*! - \qmlproperty bool QtQuick2::SpriteSequence::running + \qmlproperty bool QtQuick::SpriteSequence::running Whether the sprite is animating or not. Default is true */ /*! - \qmlproperty bool QtQuick2::SpriteSequence::interpolate + \qmlproperty bool QtQuick::SpriteSequence::interpolate If true, interpolation will occur between sprite frames to make the animation appear smoother. @@ -235,12 +235,12 @@ struct SpriteVertices { Default is true. */ /*! - \qmlproperty string QtQuick2::SpriteSequence::currentSprite + \qmlproperty string QtQuick::SpriteSequence::currentSprite The name of the Sprite which is currently animating. */ /*! - \qmlproperty string QtQuick2::SpriteSequence::goalSprite + \qmlproperty string QtQuick::SpriteSequence::goalSprite The name of the Sprite which the animation should move to. @@ -252,13 +252,13 @@ struct SpriteVertices { If it is possible to return to the goalState from the starting point of the goalState it will continue to do so until goalState is set to "" or an unreachable state. */ -/*! \qmlmethod QtQuick2::SpriteSequence::jumpTo(string sprite) +/*! \qmlmethod QtQuick::SpriteSequence::jumpTo(string sprite) This function causes the SpriteSequence to jump to the specified sprite immediately, intermediate sprites are not played. The \a sprite argument is the name of the sprite you wish to jump to. */ /*! - \qmlproperty list<Sprite> QtQuick2::SpriteSequence::sprites + \qmlproperty list<Sprite> QtQuick::SpriteSequence::sprites The sprite or sprites to draw. Sprites will be scaled to the size of this item. */ diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp index 6da4957518..705d2e490e 100644 --- a/src/quick/items/qquickstateoperations.cpp +++ b/src/quick/items/qquickstateoperations.cpp @@ -187,12 +187,12 @@ QQuickParentChange::~QQuickParentChange() } /*! - \qmlproperty real QtQuick2::ParentChange::x - \qmlproperty real QtQuick2::ParentChange::y - \qmlproperty real QtQuick2::ParentChange::width - \qmlproperty real QtQuick2::ParentChange::height - \qmlproperty real QtQuick2::ParentChange::scale - \qmlproperty real QtQuick2::ParentChange::rotation + \qmlproperty real QtQuick::ParentChange::x + \qmlproperty real QtQuick::ParentChange::y + \qmlproperty real QtQuick::ParentChange::width + \qmlproperty real QtQuick::ParentChange::height + \qmlproperty real QtQuick::ParentChange::scale + \qmlproperty real QtQuick::ParentChange::rotation These properties hold the new position, size, scale, and rotation for the item in this state. */ @@ -311,7 +311,7 @@ QQuickItem *QQuickParentChange::originalParent() const } /*! - \qmlproperty Item QtQuick2::ParentChange::target + \qmlproperty Item QtQuick::ParentChange::target This property holds the item to be reparented */ QQuickItem *QQuickParentChange::object() const @@ -327,7 +327,7 @@ void QQuickParentChange::setObject(QQuickItem *target) } /*! - \qmlproperty Item QtQuick2::ParentChange::parent + \qmlproperty Item QtQuick::ParentChange::parent This property holds the new parent for the item in this state. */ QQuickItem *QQuickParentChange::parent() const @@ -938,7 +938,7 @@ QQuickAnchorSet *QQuickAnchorChanges::anchors() } /*! - \qmlproperty Item QtQuick2::AnchorChanges::target + \qmlproperty Item QtQuick::AnchorChanges::target This property holds the \l Item for which the anchor changes will be applied. */ QQuickItem *QQuickAnchorChanges::object() const @@ -954,13 +954,13 @@ void QQuickAnchorChanges::setObject(QQuickItem *target) } /*! - \qmlproperty AnchorLine QtQuick2::AnchorChanges::anchors.left - \qmlproperty AnchorLine QtQuick2::AnchorChanges::anchors.right - \qmlproperty AnchorLine QtQuick2::AnchorChanges::anchors.horizontalCenter - \qmlproperty AnchorLine QtQuick2::AnchorChanges::anchors.top - \qmlproperty AnchorLine QtQuick2::AnchorChanges::anchors.bottom - \qmlproperty AnchorLine QtQuick2::AnchorChanges::anchors.verticalCenter - \qmlproperty AnchorLine QtQuick2::AnchorChanges::anchors.baseline + \qmlproperty AnchorLine QtQuick::AnchorChanges::anchors.left + \qmlproperty AnchorLine QtQuick::AnchorChanges::anchors.right + \qmlproperty AnchorLine QtQuick::AnchorChanges::anchors.horizontalCenter + \qmlproperty AnchorLine QtQuick::AnchorChanges::anchors.top + \qmlproperty AnchorLine QtQuick::AnchorChanges::anchors.bottom + \qmlproperty AnchorLine QtQuick::AnchorChanges::anchors.verticalCenter + \qmlproperty AnchorLine QtQuick::AnchorChanges::anchors.baseline These properties change the respective anchors of the item. diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index ae9b081b43..fbda2df2dc 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -299,7 +299,7 @@ qreal QQuickTextPrivate::getImplicitHeight() const } /*! - \qmlproperty enumeration QtQuick2::Text::renderType + \qmlproperty enumeration QtQuick::Text::renderType Override the default rendering type for this component. @@ -643,7 +643,7 @@ void QQuickTextLine::setY(qreal y) } /*! - \qmlmethod QtQuick2::Text::doLayout() + \qmlmethod QtQuick::Text::doLayout() Triggers a re-layout of the displayed text. */ @@ -1291,7 +1291,7 @@ QQuickText::~QQuickText() } /*! - \qmlproperty bool QtQuick2::Text::clip + \qmlproperty bool QtQuick::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. @@ -1300,7 +1300,7 @@ QQuickText::~QQuickText() */ /*! - \qmlsignal QtQuick2::Text::onLineLaidOut(object line) + \qmlsignal QtQuick::Text::onLineLaidOut(object line) This handler is called for each line of text that is laid out during the layout process. The specified \a line object provides more details about the line that @@ -1330,7 +1330,7 @@ QQuickText::~QQuickText() */ /*! - \qmlsignal QtQuick2::Text::onLinkActivated(string link) + \qmlsignal QtQuick::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 @@ -1346,7 +1346,7 @@ QQuickText::~QQuickText() */ /*! - \qmlproperty string QtQuick2::Text::font.family + \qmlproperty string QtQuick::Text::font.family Sets the family name of the font. @@ -1356,13 +1356,13 @@ QQuickText::~QQuickText() */ /*! - \qmlproperty bool QtQuick2::Text::font.bold + \qmlproperty bool QtQuick::Text::font.bold Sets whether the font weight is bold. */ /*! - \qmlproperty enumeration QtQuick2::Text::font.weight + \qmlproperty enumeration QtQuick::Text::font.weight Sets the font's weight. @@ -1381,31 +1381,31 @@ QQuickText::~QQuickText() */ /*! - \qmlproperty bool QtQuick2::Text::font.italic + \qmlproperty bool QtQuick::Text::font.italic Sets whether the font has an italic style. */ /*! - \qmlproperty bool QtQuick2::Text::font.underline + \qmlproperty bool QtQuick::Text::font.underline Sets whether the text is underlined. */ /*! - \qmlproperty bool QtQuick2::Text::font.strikeout + \qmlproperty bool QtQuick::Text::font.strikeout Sets whether the font has a strikeout style. */ /*! - \qmlproperty real QtQuick2::Text::font.pointSize + \qmlproperty real QtQuick::Text::font.pointSize Sets the font size in points. The point size must be greater than zero. */ /*! - \qmlproperty int QtQuick2::Text::font.pixelSize + \qmlproperty int QtQuick::Text::font.pixelSize Sets the font size in pixels. @@ -1414,7 +1414,7 @@ QQuickText::~QQuickText() */ /*! - \qmlproperty real QtQuick2::Text::font.letterSpacing + \qmlproperty real QtQuick::Text::font.letterSpacing Sets the letter spacing for the font. @@ -1423,7 +1423,7 @@ QQuickText::~QQuickText() */ /*! - \qmlproperty real QtQuick2::Text::font.wordSpacing + \qmlproperty real QtQuick::Text::font.wordSpacing Sets the word spacing for the font. @@ -1433,7 +1433,7 @@ QQuickText::~QQuickText() */ /*! - \qmlproperty enumeration QtQuick2::Text::font.capitalization + \qmlproperty enumeration QtQuick::Text::font.capitalization Sets the capitalization for the text. @@ -1485,7 +1485,7 @@ void QQuickText::setFont(const QFont &font) } /*! - \qmlproperty string QtQuick2::Text::text + \qmlproperty string QtQuick::Text::text The text to display. Text supports both plain and rich text strings. @@ -1527,7 +1527,7 @@ void QQuickText::setText(const QString &n) } /*! - \qmlproperty color QtQuick2::Text::color + \qmlproperty color QtQuick::Text::color The text color. @@ -1569,7 +1569,7 @@ void QQuickText::setColor(const QColor &color) } /*! - \qmlproperty color QtQuick2::Text::linkColor + \qmlproperty color QtQuick::Text::linkColor The color of links in the text. @@ -1597,7 +1597,7 @@ void QQuickText::setLinkColor(const QColor &color) } /*! - \qmlproperty enumeration QtQuick2::Text::style + \qmlproperty enumeration QtQuick::Text::style Set an additional text style. @@ -1641,7 +1641,7 @@ void QQuickText::setStyle(QQuickText::TextStyle style) } /*! - \qmlproperty color QtQuick2::Text::styleColor + \qmlproperty color QtQuick::Text::styleColor Defines the secondary color used by text styles. @@ -1677,9 +1677,9 @@ void QQuickText::setStyleColor(const QColor &color) } /*! - \qmlproperty enumeration QtQuick2::Text::horizontalAlignment - \qmlproperty enumeration QtQuick2::Text::verticalAlignment - \qmlproperty enumeration QtQuick2::Text::effectiveHorizontalAlignment + \qmlproperty enumeration QtQuick::Text::horizontalAlignment + \qmlproperty enumeration QtQuick::Text::verticalAlignment + \qmlproperty enumeration QtQuick::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 @@ -1802,7 +1802,7 @@ void QQuickText::setVAlign(VAlignment align) } /*! - \qmlproperty enumeration QtQuick2::Text::wrapMode + \qmlproperty enumeration QtQuick::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: @@ -1833,7 +1833,7 @@ void QQuickText::setWrapMode(WrapMode mode) } /*! - \qmlproperty int QtQuick2::Text::lineCount + \qmlproperty int QtQuick::Text::lineCount Returns the number of lines visible in the text item. @@ -1848,7 +1848,7 @@ int QQuickText::lineCount() const } /*! - \qmlproperty bool QtQuick2::Text::truncated + \qmlproperty bool QtQuick::Text::truncated Returns true if the text has been truncated due to \l maximumLineCount or \l elide. @@ -1864,7 +1864,7 @@ bool QQuickText::truncated() const } /*! - \qmlproperty int QtQuick2::Text::maximumLineCount + \qmlproperty int QtQuick::Text::maximumLineCount Set this property to limit the number of lines that the text item will show. If elide is set to Text.ElideRight, the text will be elided appropriately. @@ -1904,7 +1904,7 @@ void QQuickText::resetMaximumLineCount() } /*! - \qmlproperty enumeration QtQuick2::Text::textFormat + \qmlproperty enumeration QtQuick::Text::textFormat The way the text property should be displayed. @@ -2007,7 +2007,7 @@ void QQuickText::setTextFormat(TextFormat format) } /*! - \qmlproperty enumeration QtQuick2::Text::elide + \qmlproperty enumeration QtQuick::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. @@ -2052,7 +2052,7 @@ void QQuickText::setElideMode(QQuickText::TextElideMode mode) } /*! - \qmlproperty url QtQuick2::Text::baseUrl + \qmlproperty url QtQuick::Text::baseUrl This property specifies a base URL which is used to resolve relative URLs within the text. @@ -2291,7 +2291,7 @@ void QQuickText::updatePolish() } /*! - \qmlproperty real QtQuick2::Text::contentWidth + \qmlproperty real QtQuick::Text::contentWidth Returns the width of the text, including width past the width which is covered due to insufficient wrapping if WrapMode is set. @@ -2303,7 +2303,7 @@ qreal QQuickText::contentWidth() const } /*! - \qmlproperty real QtQuick2::Text::contentHeight + \qmlproperty real QtQuick::Text::contentHeight 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. @@ -2315,7 +2315,7 @@ qreal QQuickText::contentHeight() const } /*! - \qmlproperty real QtQuick2::Text::lineHeight + \qmlproperty real QtQuick::Text::lineHeight Sets the line height for the text. The value can be in pixels or a multiplier depending on lineHeightMode. @@ -2343,7 +2343,7 @@ void QQuickText::setLineHeight(qreal lineHeight) } /*! - \qmlproperty enumeration QtQuick2::Text::lineHeightMode + \qmlproperty enumeration QtQuick::Text::lineHeightMode This property determines how the line height is specified. The possible values are: @@ -2374,7 +2374,7 @@ void QQuickText::setLineHeightMode(LineHeightMode mode) } /*! - \qmlproperty enumeration QtQuick2::Text::fontSizeMode + \qmlproperty enumeration QtQuick::Text::fontSizeMode This property specifies how the font size of the displayed text is determined. The possible values are: @@ -2417,7 +2417,7 @@ void QQuickText::setFontSizeMode(FontSizeMode mode) } /*! - \qmlproperty int QtQuick2::Text::minimumPixelSize + \qmlproperty int QtQuick::Text::minimumPixelSize This property specifies the minimum font pixel size of text scaled by the fontSizeMode property. @@ -2445,7 +2445,7 @@ void QQuickText::setMinimumPixelSize(int size) } /*! - \qmlproperty int QtQuick2::Text::minimumPointSize + \qmlproperty int QtQuick::Text::minimumPointSize This property specifies the minimum font point \l size of text scaled by the fontSizeMode property. @@ -2593,7 +2593,7 @@ bool QQuickTextPrivate::isLinkHoveredConnected() } /*! - \qmlsignal QtQuick2::Text::onLinkHovered(string link) + \qmlsignal QtQuick::Text::onLinkHovered(string link) \since 5.2 This handler is called when the user hovers a link embedded in the @@ -2604,7 +2604,7 @@ bool QQuickTextPrivate::isLinkHoveredConnected() */ /*! - \qmlproperty string QtQuick2::Text::hoveredLink + \qmlproperty string QtQuick::Text::hoveredLink \since 5.2 This property contains the link string when user hovers a link diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index c49e62e91b..48518f1ba3 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -116,7 +116,7 @@ TextEdit { */ /*! - \qmlsignal QtQuick2::TextEdit::onLinkActivated(string link) + \qmlsignal QtQuick::TextEdit::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 @@ -193,7 +193,7 @@ QString QQuickTextEdit::text() const } /*! - \qmlproperty string QtQuick2::TextEdit::font.family + \qmlproperty string QtQuick::TextEdit::font.family Sets the family name of the font. @@ -203,13 +203,13 @@ QString QQuickTextEdit::text() const */ /*! - \qmlproperty bool QtQuick2::TextEdit::font.bold + \qmlproperty bool QtQuick::TextEdit::font.bold Sets whether the font weight is bold. */ /*! - \qmlproperty enumeration QtQuick2::TextEdit::font.weight + \qmlproperty enumeration QtQuick::TextEdit::font.weight Sets the font's weight. @@ -228,31 +228,31 @@ QString QQuickTextEdit::text() const */ /*! - \qmlproperty bool QtQuick2::TextEdit::font.italic + \qmlproperty bool QtQuick::TextEdit::font.italic Sets whether the font has an italic style. */ /*! - \qmlproperty bool QtQuick2::TextEdit::font.underline + \qmlproperty bool QtQuick::TextEdit::font.underline Sets whether the text is underlined. */ /*! - \qmlproperty bool QtQuick2::TextEdit::font.strikeout + \qmlproperty bool QtQuick::TextEdit::font.strikeout Sets whether the font has a strikeout style. */ /*! - \qmlproperty real QtQuick2::TextEdit::font.pointSize + \qmlproperty real QtQuick::TextEdit::font.pointSize Sets the font size in points. The point size must be greater than zero. */ /*! - \qmlproperty int QtQuick2::TextEdit::font.pixelSize + \qmlproperty int QtQuick::TextEdit::font.pixelSize Sets the font size in pixels. @@ -262,7 +262,7 @@ QString QQuickTextEdit::text() const */ /*! - \qmlproperty real QtQuick2::TextEdit::font.letterSpacing + \qmlproperty real QtQuick::TextEdit::font.letterSpacing Sets the letter spacing for the font. @@ -271,7 +271,7 @@ QString QQuickTextEdit::text() const */ /*! - \qmlproperty real QtQuick2::TextEdit::font.wordSpacing + \qmlproperty real QtQuick::TextEdit::font.wordSpacing Sets the word spacing for the font. @@ -281,7 +281,7 @@ QString QQuickTextEdit::text() const */ /*! - \qmlproperty enumeration QtQuick2::TextEdit::font.capitalization + \qmlproperty enumeration QtQuick::TextEdit::font.capitalization Sets the capitalization for the text. @@ -299,7 +299,7 @@ QString QQuickTextEdit::text() const */ /*! - \qmlproperty string QtQuick2::TextEdit::text + \qmlproperty string QtQuick::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 @@ -333,7 +333,7 @@ void QQuickTextEdit::setText(const QString &text) } /*! - \qmlproperty enumeration QtQuick2::TextEdit::textFormat + \qmlproperty enumeration QtQuick::TextEdit::textFormat The way the text property should be displayed. @@ -404,7 +404,7 @@ void QQuickTextEdit::setTextFormat(TextFormat format) } /*! - \qmlproperty enumeration QtQuick2::TextEdit::renderType + \qmlproperty enumeration QtQuick::TextEdit::renderType Override the default rendering type for this component. @@ -479,7 +479,7 @@ void QQuickTextEdit::setFont(const QFont &font) } /*! - \qmlproperty color QtQuick2::TextEdit::color + \qmlproperty color QtQuick::TextEdit::color The text color. @@ -511,7 +511,7 @@ void QQuickTextEdit::setColor(const QColor &color) } /*! - \qmlproperty color QtQuick2::TextEdit::selectionColor + \qmlproperty color QtQuick::TextEdit::selectionColor The text highlight color, used behind selections. */ @@ -533,7 +533,7 @@ void QQuickTextEdit::setSelectionColor(const QColor &color) } /*! - \qmlproperty color QtQuick2::TextEdit::selectedTextColor + \qmlproperty color QtQuick::TextEdit::selectedTextColor The selected text color, used in selections. */ @@ -555,9 +555,9 @@ void QQuickTextEdit::setSelectedTextColor(const QColor &color) } /*! - \qmlproperty enumeration QtQuick2::TextEdit::horizontalAlignment - \qmlproperty enumeration QtQuick2::TextEdit::verticalAlignment - \qmlproperty enumeration QtQuick2::TextEdit::effectiveHorizontalAlignment + \qmlproperty enumeration QtQuick::TextEdit::horizontalAlignment + \qmlproperty enumeration QtQuick::TextEdit::verticalAlignment + \qmlproperty enumeration QtQuick::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 @@ -720,7 +720,7 @@ void QQuickTextEdit::setVAlign(QQuickTextEdit::VAlignment alignment) emit verticalAlignmentChanged(d->vAlign); } /*! - \qmlproperty enumeration QtQuick2::TextEdit::wrapMode + \qmlproperty enumeration QtQuick::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. @@ -752,7 +752,7 @@ void QQuickTextEdit::setWrapMode(WrapMode mode) } /*! - \qmlproperty int QtQuick2::TextEdit::lineCount + \qmlproperty int QtQuick::TextEdit::lineCount Returns the total number of lines in the textEdit item. */ @@ -763,7 +763,7 @@ int QQuickTextEdit::lineCount() const } /*! - \qmlproperty int QtQuick2::TextEdit::length + \qmlproperty int QtQuick::TextEdit::length Returns the total number of plain text characters in the TextEdit item. @@ -782,7 +782,7 @@ int QQuickTextEdit::length() const } /*! - \qmlproperty real QtQuick2::TextEdit::contentWidth + \qmlproperty real QtQuick::TextEdit::contentWidth Returns the width of the text, including the width past the width which is covered due to insufficient wrapping if \l wrapMode is set. @@ -794,7 +794,7 @@ qreal QQuickTextEdit::contentWidth() const } /*! - \qmlproperty real QtQuick2::TextEdit::contentHeight + \qmlproperty real QtQuick::TextEdit::contentHeight 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. @@ -806,7 +806,7 @@ qreal QQuickTextEdit::contentHeight() const } /*! - \qmlproperty url QtQuick2::TextEdit::baseUrl + \qmlproperty url QtQuick::TextEdit::baseUrl This property specifies a base URL which is used to resolve relative URLs within the text. @@ -844,7 +844,7 @@ void QQuickTextEdit::resetBaseUrl() } /*! - \qmlmethod rectangle QtQuick2::TextEdit::positionToRectangle(position) + \qmlmethod rectangle QtQuick::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 @@ -860,7 +860,7 @@ QRectF QQuickTextEdit::positionToRectangle(int pos) const } /*! - \qmlmethod int QtQuick2::TextEdit::positionAt(int x, int y) + \qmlmethod int QtQuick::TextEdit::positionAt(int x, int y) Returns the text position closest to pixel position (\a x, \a y). @@ -896,7 +896,7 @@ int QQuickTextEdit::positionAt(qreal x, qreal y) const } /*! - \qmlmethod QtQuick2::TextEdit::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters) + \qmlmethod QtQuick::TextEdit::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters) Moves the cursor to \a position and updates the selection according to the optional \a mode parameter. (To only move the cursor, set the \l cursorPosition property.) @@ -993,7 +993,7 @@ void QQuickTextEdit::moveCursorSelection(int pos, SelectionMode mode) } /*! - \qmlproperty bool QtQuick2::TextEdit::cursorVisible + \qmlproperty bool QtQuick::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 @@ -1020,7 +1020,7 @@ void QQuickTextEdit::setCursorVisible(bool on) } /*! - \qmlproperty int QtQuick2::TextEdit::cursorPosition + \qmlproperty int QtQuick::TextEdit::cursorPosition The position of the cursor in the TextEdit. */ int QQuickTextEdit::cursorPosition() const @@ -1043,7 +1043,7 @@ void QQuickTextEdit::setCursorPosition(int pos) } /*! - \qmlproperty Component QtQuick2::TextEdit::cursorDelegate + \qmlproperty Component QtQuick::TextEdit::cursorDelegate The delegate for the cursor in the TextEdit. If you set a cursorDelegate for a TextEdit, this delegate will be used for @@ -1075,7 +1075,7 @@ void QQuickTextEdit::createCursor() } /*! - \qmlproperty int QtQuick2::TextEdit::selectionStart + \qmlproperty int QtQuick::TextEdit::selectionStart The cursor position before the first character in the current selection. @@ -1091,7 +1091,7 @@ int QQuickTextEdit::selectionStart() const } /*! - \qmlproperty int QtQuick2::TextEdit::selectionEnd + \qmlproperty int QtQuick::TextEdit::selectionEnd The cursor position after the last character in the current selection. @@ -1107,7 +1107,7 @@ int QQuickTextEdit::selectionEnd() const } /*! - \qmlproperty string QtQuick2::TextEdit::selectedText + \qmlproperty string QtQuick::TextEdit::selectedText This read-only property provides the text currently selected in the text edit. @@ -1133,7 +1133,7 @@ QString QQuickTextEdit::selectedText() const } /*! - \qmlproperty bool QtQuick2::TextEdit::activeFocusOnPress + \qmlproperty bool QtQuick::TextEdit::activeFocusOnPress Whether the TextEdit should gain active focus on a mouse press. By default this is set to true. @@ -1154,7 +1154,7 @@ void QQuickTextEdit::setFocusOnPress(bool on) } /*! - \qmlproperty bool QtQuick2::TextEdit::persistentSelection + \qmlproperty bool QtQuick::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 false. @@ -1175,7 +1175,7 @@ void QQuickTextEdit::setPersistentSelection(bool on) } /*! - \qmlproperty real QtQuick2::TextEdit::textMargin + \qmlproperty real QtQuick::TextEdit::textMargin The margin, in pixels, around the text in the TextEdit. */ @@ -1196,7 +1196,7 @@ void QQuickTextEdit::setTextMargin(qreal margin) } /*! - \qmlproperty enumeration QtQuick2::TextEdit::inputMethodHints + \qmlproperty enumeration QtQuick::TextEdit::inputMethodHints Provides hints to the input method about the expected content of the text edit and how it should operate. @@ -1301,7 +1301,7 @@ void QQuickTextEdit::componentComplete() } /*! - \qmlproperty bool QtQuick2::TextEdit::selectByKeyboard + \qmlproperty bool QtQuick::TextEdit::selectByKeyboard \since 5.1 Defaults to true when the editor is editable, and false @@ -1338,7 +1338,7 @@ void QQuickTextEdit::setSelectByKeyboard(bool on) } /*! - \qmlproperty bool QtQuick2::TextEdit::selectByMouse + \qmlproperty bool QtQuick::TextEdit::selectByMouse Defaults to false. @@ -1368,7 +1368,7 @@ void QQuickTextEdit::setSelectByMouse(bool on) } /*! - \qmlproperty enumeration QtQuick2::TextEdit::mouseSelectionMode + \qmlproperty enumeration QtQuick::TextEdit::mouseSelectionMode Specifies how text should be selected using a mouse. @@ -1396,7 +1396,7 @@ void QQuickTextEdit::setMouseSelectionMode(SelectionMode mode) } /*! - \qmlproperty bool QtQuick2::TextEdit::readOnly + \qmlproperty bool QtQuick::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. @@ -1441,7 +1441,7 @@ bool QQuickTextEdit::isReadOnly() const } /*! - \qmlproperty rectangle QtQuick2::TextEdit::cursorRectangle + \qmlproperty rectangle QtQuick::TextEdit::cursorRectangle The rectangle where the standard text cursor is rendered within the text edit. Read-only. @@ -1491,7 +1491,7 @@ void QQuickTextEdit::keyReleaseEvent(QKeyEvent *event) } /*! - \qmlmethod QtQuick2::TextEdit::deselect() + \qmlmethod QtQuick::TextEdit::deselect() Removes active text selection. */ @@ -1504,7 +1504,7 @@ void QQuickTextEdit::deselect() } /*! - \qmlmethod QtQuick2::TextEdit::selectAll() + \qmlmethod QtQuick::TextEdit::selectAll() Causes all text to be selected. */ @@ -1515,7 +1515,7 @@ void QQuickTextEdit::selectAll() } /*! - \qmlmethod QtQuick2::TextEdit::selectWord() + \qmlmethod QtQuick::TextEdit::selectWord() Causes the word closest to the current cursor position to be selected. */ @@ -1528,7 +1528,7 @@ void QQuickTextEdit::selectWord() } /*! - \qmlmethod QtQuick2::TextEdit::select(int start, int end) + \qmlmethod QtQuick::TextEdit::select(int start, int end) Causes the text from \a start to \a end to be selected. @@ -1557,7 +1557,7 @@ void QQuickTextEdit::select(int start, int end) } /*! - \qmlmethod QtQuick2::TextEdit::isRightToLeft(int start, int end) + \qmlmethod QtQuick::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. @@ -1574,7 +1574,7 @@ bool QQuickTextEdit::isRightToLeft(int start, int end) #ifndef QT_NO_CLIPBOARD /*! - \qmlmethod QtQuick2::TextEdit::cut() + \qmlmethod QtQuick::TextEdit::cut() Moves the currently selected text to the system clipboard. */ @@ -1585,7 +1585,7 @@ void QQuickTextEdit::cut() } /*! - \qmlmethod QtQuick2::TextEdit::copy() + \qmlmethod QtQuick::TextEdit::copy() Copies the currently selected text to the system clipboard. */ @@ -1596,7 +1596,7 @@ void QQuickTextEdit::copy() } /*! - \qmlmethod QtQuick2::TextEdit::paste() + \qmlmethod QtQuick::TextEdit::paste() Replaces the currently selected text by the contents of the system clipboard. */ @@ -1609,7 +1609,7 @@ void QQuickTextEdit::paste() /*! - \qmlmethod QtQuick2::TextEdit::undo() + \qmlmethod QtQuick::TextEdit::undo() Undoes the last operation if undo is \l {canUndo}{available}. Deselects any current selection, and updates the selection start to the current cursor @@ -1623,7 +1623,7 @@ void QQuickTextEdit::undo() } /*! - \qmlmethod QtQuick2::TextEdit::redo() + \qmlmethod QtQuick::TextEdit::redo() Redoes the last operation if redo is \l {canRedo}{available}. */ @@ -1906,7 +1906,7 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData * } /*! - \qmlproperty bool QtQuick2::TextEdit::canPaste + \qmlproperty bool QtQuick::TextEdit::canPaste Returns true if the TextEdit is writable and the content of the clipboard is suitable for pasting into the TextEdit. @@ -1922,7 +1922,7 @@ bool QQuickTextEdit::canPaste() const } /*! - \qmlproperty bool QtQuick2::TextEdit::canUndo + \qmlproperty bool QtQuick::TextEdit::canUndo Returns true if the TextEdit is writable and there are previous operations that can be undone. @@ -1935,7 +1935,7 @@ bool QQuickTextEdit::canUndo() const } /*! - \qmlproperty bool QtQuick2::TextEdit::canRedo + \qmlproperty bool QtQuick::TextEdit::canRedo Returns true if the TextEdit is writable and there are \l {undo}{undone} operations that can be redone. @@ -1949,7 +1949,7 @@ bool QQuickTextEdit::canRedo() const #ifndef QT_NO_IM /*! - \qmlproperty bool QtQuick2::TextEdit::inputMethodComposing + \qmlproperty bool QtQuick::TextEdit::inputMethodComposing This property holds whether the TextEdit has partial text input from an @@ -2385,7 +2385,7 @@ void QQuickTextEdit::q_canPasteChanged() } /*! - \qmlmethod string QtQuick2::TextEdit::getText(int start, int end) + \qmlmethod string QtQuick::TextEdit::getText(int start, int end) Returns the section of text that is between the \a start and \a end positions. @@ -2410,7 +2410,7 @@ QString QQuickTextEdit::getText(int start, int end) const } /*! - \qmlmethod string QtQuick2::TextEdit::getFormattedText(int start, int end) + \qmlmethod string QtQuick::TextEdit::getFormattedText(int start, int end) Returns the section of text that is between the \a start and \a end positions. @@ -2440,7 +2440,7 @@ QString QQuickTextEdit::getFormattedText(int start, int end) const } /*! - \qmlmethod QtQuick2::TextEdit::insert(int position, string text) + \qmlmethod QtQuick::TextEdit::insert(int position, string text) Inserts \a text into the TextEdit at position. */ @@ -2465,7 +2465,7 @@ void QQuickTextEdit::insert(int position, const QString &text) } /*! - \qmlmethod string QtQuick2::TextEdit::remove(int start, int end) + \qmlmethod string QtQuick::TextEdit::remove(int start, int end) Removes the section of text that is between the \a start and \a end positions from the TextEdit. */ @@ -2483,7 +2483,7 @@ void QQuickTextEdit::remove(int start, int end) } /*! - \qmlproperty TextDocument QtQuick2::TextEdit::textDocument + \qmlproperty TextDocument QtQuick::TextEdit::textDocument \since 5.1 Returns the QQuickTextDocument of this TextEdit. @@ -2508,7 +2508,7 @@ bool QQuickTextEditPrivate::isLinkHoveredConnected() } /*! - \qmlsignal QtQuick2::TextEdit::onLinkHovered(string link) + \qmlsignal QtQuick::TextEdit::onLinkHovered(string link) \since 5.2 This handler is called when the user hovers a link embedded in the text. @@ -2519,7 +2519,7 @@ bool QQuickTextEditPrivate::isLinkHoveredConnected() */ /*! - \qmlproperty string QtQuick2::TextEdit::hoveredLink + \qmlproperty string QtQuick::TextEdit::hoveredLink \since 5.2 This property contains the link string when user hovers a link @@ -2567,7 +2567,7 @@ void QQuickTextEdit::hoverLeaveEvent(QHoverEvent *event) } /*! - \qmlmethod void QtQuick2::TextEdit::append(string text) + \qmlmethod void QtQuick::TextEdit::append(string text) \since 5.2 Appends a new paragraph with \a text to the end of the TextEdit. diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 287406a5ec..1848fbb80b 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -114,7 +114,7 @@ void QQuickTextInput::componentComplete() } /*! - \qmlproperty string QtQuick2::TextInput::text + \qmlproperty string QtQuick::TextInput::text The text in the TextInput. */ @@ -141,7 +141,7 @@ void QQuickTextInput::setText(const QString &s) /*! - \qmlproperty enumeration QtQuick2::TextInput::renderType + \qmlproperty enumeration QtQuick::TextInput::renderType Override the default rendering type for this component. @@ -179,7 +179,7 @@ void QQuickTextInput::setRenderType(QQuickTextInput::RenderType renderType) } /*! - \qmlproperty int QtQuick2::TextInput::length + \qmlproperty int QtQuick::TextInput::length Returns the total number of characters in the TextInput item. @@ -197,7 +197,7 @@ int QQuickTextInput::length() const } /*! - \qmlmethod string QtQuick2::TextInput::getText(int start, int end) + \qmlmethod string QtQuick::TextInput::getText(int start, int end) Returns the section of text that is between the \a start and \a end positions. @@ -221,7 +221,7 @@ QString QQuickTextInputPrivate::realText() const } /*! - \qmlproperty string QtQuick2::TextInput::font.family + \qmlproperty string QtQuick::TextInput::font.family Sets the family name of the font. @@ -231,13 +231,13 @@ QString QQuickTextInputPrivate::realText() const */ /*! - \qmlproperty bool QtQuick2::TextInput::font.bold + \qmlproperty bool QtQuick::TextInput::font.bold Sets whether the font weight is bold. */ /*! - \qmlproperty enumeration QtQuick2::TextInput::font.weight + \qmlproperty enumeration QtQuick::TextInput::font.weight Sets the font's weight. @@ -256,31 +256,31 @@ QString QQuickTextInputPrivate::realText() const */ /*! - \qmlproperty bool QtQuick2::TextInput::font.italic + \qmlproperty bool QtQuick::TextInput::font.italic Sets whether the font has an italic style. */ /*! - \qmlproperty bool QtQuick2::TextInput::font.underline + \qmlproperty bool QtQuick::TextInput::font.underline Sets whether the text is underlined. */ /*! - \qmlproperty bool QtQuick2::TextInput::font.strikeout + \qmlproperty bool QtQuick::TextInput::font.strikeout Sets whether the font has a strikeout style. */ /*! - \qmlproperty real QtQuick2::TextInput::font.pointSize + \qmlproperty real QtQuick::TextInput::font.pointSize Sets the font size in points. The point size must be greater than zero. */ /*! - \qmlproperty int QtQuick2::TextInput::font.pixelSize + \qmlproperty int QtQuick::TextInput::font.pixelSize Sets the font size in pixels. @@ -289,7 +289,7 @@ QString QQuickTextInputPrivate::realText() const */ /*! - \qmlproperty real QtQuick2::TextInput::font.letterSpacing + \qmlproperty real QtQuick::TextInput::font.letterSpacing Sets the letter spacing for the font. @@ -298,7 +298,7 @@ QString QQuickTextInputPrivate::realText() const */ /*! - \qmlproperty real QtQuick2::TextInput::font.wordSpacing + \qmlproperty real QtQuick::TextInput::font.wordSpacing Sets the word spacing for the font. @@ -308,7 +308,7 @@ QString QQuickTextInputPrivate::realText() const */ /*! - \qmlproperty enumeration QtQuick2::TextInput::font.capitalization + \qmlproperty enumeration QtQuick::TextInput::font.capitalization Sets the capitalization for the text. @@ -356,7 +356,7 @@ void QQuickTextInput::setFont(const QFont &font) } /*! - \qmlproperty color QtQuick2::TextInput::color + \qmlproperty color QtQuick::TextInput::color The text color. */ @@ -380,7 +380,7 @@ void QQuickTextInput::setColor(const QColor &c) /*! - \qmlproperty color QtQuick2::TextInput::selectionColor + \qmlproperty color QtQuick::TextInput::selectionColor The text highlight color, used behind selections. */ @@ -405,7 +405,7 @@ void QQuickTextInput::setSelectionColor(const QColor &color) emit selectionColorChanged(); } /*! - \qmlproperty color QtQuick2::TextInput::selectedTextColor + \qmlproperty color QtQuick::TextInput::selectedTextColor The highlighted text color, used in selections. */ @@ -431,9 +431,9 @@ void QQuickTextInput::setSelectedTextColor(const QColor &color) } /*! - \qmlproperty enumeration QtQuick2::TextInput::horizontalAlignment - \qmlproperty enumeration QtQuick2::TextInput::effectiveHorizontalAlignment - \qmlproperty enumeration QtQuick2::TextInput::verticalAlignment + \qmlproperty enumeration QtQuick::TextInput::horizontalAlignment + \qmlproperty enumeration QtQuick::TextInput::effectiveHorizontalAlignment + \qmlproperty enumeration QtQuick::TextInput::verticalAlignment Sets the horizontal alignment of the text within the TextInput item's width and height. By default, the text alignment follows the natural alignment @@ -588,7 +588,7 @@ void QQuickTextInput::setVAlign(QQuickTextInput::VAlignment alignment) } /*! - \qmlproperty enumeration QtQuick2::TextInput::wrapMode + \qmlproperty enumeration QtQuick::TextInput::wrapMode Set this property to wrap the text to the TextInput item's width. The text will only wrap if an explicit width has been set. @@ -631,7 +631,7 @@ void QQuickTextInputPrivate::mirrorChange() } /*! - \qmlproperty bool QtQuick2::TextInput::readOnly + \qmlproperty bool QtQuick::TextInput::readOnly Sets whether user input can modify the contents of the TextInput. @@ -666,7 +666,7 @@ void QQuickTextInput::setReadOnly(bool ro) } /*! - \qmlproperty int QtQuick2::TextInput::maximumLength + \qmlproperty int QtQuick::TextInput::maximumLength The maximum permitted length of the text in the TextInput. If the text is too long, it is truncated at the limit. @@ -692,7 +692,7 @@ void QQuickTextInput::setMaxLength(int ml) } /*! - \qmlproperty bool QtQuick2::TextInput::cursorVisible + \qmlproperty bool QtQuick::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 @@ -740,7 +740,7 @@ void QQuickTextInput::setCursorVisible(bool on) } /*! - \qmlproperty int QtQuick2::TextInput::cursorPosition + \qmlproperty int QtQuick::TextInput::cursorPosition The position of the cursor in the TextInput. */ int QQuickTextInput::cursorPosition() const @@ -758,7 +758,7 @@ void QQuickTextInput::setCursorPosition(int cp) } /*! - \qmlproperty rectangle QtQuick2::TextInput::cursorRectangle + \qmlproperty rectangle QtQuick::TextInput::cursorRectangle The rectangle where the standard text cursor is rendered within the text input. Read only. @@ -787,7 +787,7 @@ QRectF QQuickTextInput::cursorRectangle() const } /*! - \qmlproperty int QtQuick2::TextInput::selectionStart + \qmlproperty int QtQuick::TextInput::selectionStart The cursor position before the first character in the current selection. @@ -802,7 +802,7 @@ int QQuickTextInput::selectionStart() const return d->lastSelectionStart; } /*! - \qmlproperty int QtQuick2::TextInput::selectionEnd + \qmlproperty int QtQuick::TextInput::selectionEnd The cursor position after the last character in the current selection. @@ -817,7 +817,7 @@ int QQuickTextInput::selectionEnd() const return d->lastSelectionEnd; } /*! - \qmlmethod QtQuick2::TextInput::select(int start, int end) + \qmlmethod QtQuick::TextInput::select(int start, int end) Causes the text from \a start to \a end to be selected. @@ -838,7 +838,7 @@ void QQuickTextInput::select(int start, int end) } /*! - \qmlproperty string QtQuick2::TextInput::selectedText + \qmlproperty string QtQuick::TextInput::selectedText This read-only property provides the text currently selected in the text input. @@ -858,7 +858,7 @@ QString QQuickTextInput::selectedText() const } /*! - \qmlproperty bool QtQuick2::TextInput::activeFocusOnPress + \qmlproperty bool QtQuick::TextInput::activeFocusOnPress Whether the TextInput should gain active focus on a mouse press. By default this is set to true. @@ -880,7 +880,7 @@ void QQuickTextInput::setFocusOnPress(bool b) emit activeFocusOnPressChanged(d->focusOnPress); } /*! - \qmlproperty bool QtQuick2::TextInput::autoScroll + \qmlproperty bool QtQuick::TextInput::autoScroll Whether the TextInput should scroll when the text is longer than the width. By default this is set to true. @@ -927,11 +927,11 @@ QQuickIntValidator::QQuickIntValidator(QObject *parent) } /*! - \qmlproperty string QtQuick2::IntValidator::locale + \qmlproperty string QtQuick::IntValidator::locale This property holds the name of the locale used to interpret the number. - \sa {QtQml2::Qt::locale()}{Qt.locale()} + \sa {QtQml::Qt::locale()}{Qt.locale()} */ QString QQuickIntValidator::localeName() const @@ -957,13 +957,13 @@ void QQuickIntValidator::resetLocaleName() } /*! - \qmlproperty int QtQuick2::IntValidator::top + \qmlproperty int QtQuick::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 QtQuick2::IntValidator::bottom + \qmlproperty int QtQuick::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). @@ -1002,11 +1002,11 @@ QQuickDoubleValidator::QQuickDoubleValidator(QObject *parent) } /*! - \qmlproperty string QtQuick2::DoubleValidator::locale + \qmlproperty string QtQuick::DoubleValidator::locale This property holds the name of the locale used to interpret the number. - \sa {QtQml2::Qt::locale()}{Qt.locale()} + \sa {QtQml::Qt::locale()}{Qt.locale()} */ QString QQuickDoubleValidator::localeName() const @@ -1032,25 +1032,25 @@ void QQuickDoubleValidator::resetLocaleName() } /*! - \qmlproperty real QtQuick2::DoubleValidator::top + \qmlproperty real QtQuick::DoubleValidator::top This property holds the validator's maximum acceptable value. By default, this property contains a value of infinity. */ /*! - \qmlproperty real QtQuick2::DoubleValidator::bottom + \qmlproperty real QtQuick::DoubleValidator::bottom This property holds the validator's minimum acceptable value. By default, this property contains a value of -infinity. */ /*! - \qmlproperty int QtQuick2::DoubleValidator::decimals + \qmlproperty int QtQuick::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 QtQuick2::DoubleValidator::notation + \qmlproperty enumeration QtQuick::DoubleValidator::notation This property holds the notation of how a string can describe a number. The possible values for this property are: @@ -1074,7 +1074,7 @@ void QQuickDoubleValidator::resetLocaleName() matches a specified regular expression. */ /*! - \qmlproperty regExp QtQuick2::RegExpValidator::regExp + \qmlproperty regExp QtQuick::RegExpValidator::regExp This property holds the regular expression used for validation. @@ -1085,7 +1085,7 @@ void QQuickDoubleValidator::resetLocaleName() */ /*! - \qmlproperty Validator QtQuick2::TextInput::validator + \qmlproperty Validator QtQuick::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 @@ -1165,7 +1165,7 @@ void QQuickTextInputPrivate::checkIsValid() } /*! - \qmlproperty string QtQuick2::TextInput::inputMask + \qmlproperty string QtQuick::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 @@ -1190,7 +1190,7 @@ void QQuickTextInput::setInputMask(const QString &im) } /*! - \qmlproperty bool QtQuick2::TextInput::acceptableInput + \qmlproperty bool QtQuick::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 @@ -1204,7 +1204,7 @@ bool QQuickTextInput::hasAcceptableInput() const } /*! - \qmlsignal QtQuick2::TextInput::onAccepted() + \qmlsignal QtQuick::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 @@ -1227,7 +1227,7 @@ Qt::InputMethodHints QQuickTextInputPrivate::effectiveInputMethodHints() const #endif /*! - \qmlproperty enumeration QtQuick2::TextInput::echoMode + \qmlproperty enumeration QtQuick::TextInput::echoMode Specifies how the text should be displayed in the TextInput. \list @@ -1264,7 +1264,7 @@ void QQuickTextInput::setEchoMode(QQuickTextInput::EchoMode echo) #ifndef QT_NO_IM /*! - \qmlproperty enumeration QtQuick2::TextInput::inputMethodHints + \qmlproperty enumeration QtQuick::TextInput::inputMethodHints Provides hints to the input method about the expected content of the text input and how it should operate. @@ -1328,7 +1328,7 @@ void QQuickTextInput::setInputMethodHints(Qt::InputMethodHints hints) #endif // QT_NO_IM /*! - \qmlproperty Component QtQuick2::TextInput::cursorDelegate + \qmlproperty Component QtQuick::TextInput::cursorDelegate The delegate for the cursor in the TextInput. If you set a cursorDelegate for a TextInput, this delegate will be used for @@ -1360,7 +1360,7 @@ void QQuickTextInput::createCursor() } /*! - \qmlmethod rect QtQuick2::TextInput::positionToRectangle(int pos) + \qmlmethod rect QtQuick::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. @@ -1387,7 +1387,7 @@ QRectF QQuickTextInput::positionToRectangle(int pos) const } /*! - \qmlmethod int QtQuick2::TextInput::positionAt(real x, real y, CursorPosition position = CursorBetweenCharacters) + \qmlmethod int QtQuick::TextInput::positionAt(real x, real y, CursorPosition position = CursorBetweenCharacters) This function returns the character position at x and y pixels from the top left of the textInput. Position 0 is before the @@ -1929,7 +1929,7 @@ QVariant QQuickTextInput::inputMethodQuery(Qt::InputMethodQuery property) const #endif // QT_NO_IM /*! - \qmlmethod QtQuick2::TextInput::deselect() + \qmlmethod QtQuick::TextInput::deselect() Removes active text selection. */ @@ -1940,7 +1940,7 @@ void QQuickTextInput::deselect() } /*! - \qmlmethod QtQuick2::TextInput::selectAll() + \qmlmethod QtQuick::TextInput::selectAll() Causes all text to be selected. */ @@ -1951,7 +1951,7 @@ void QQuickTextInput::selectAll() } /*! - \qmlmethod QtQuick2::TextInput::isRightToLeft(int start, int end) + \qmlmethod QtQuick::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. @@ -1968,7 +1968,7 @@ bool QQuickTextInput::isRightToLeft(int start, int end) #ifndef QT_NO_CLIPBOARD /*! - \qmlmethod QtQuick2::TextInput::cut() + \qmlmethod QtQuick::TextInput::cut() Moves the currently selected text to the system clipboard. */ @@ -1982,7 +1982,7 @@ void QQuickTextInput::cut() } /*! - \qmlmethod QtQuick2::TextInput::copy() + \qmlmethod QtQuick::TextInput::copy() Copies the currently selected text to the system clipboard. */ @@ -1993,7 +1993,7 @@ void QQuickTextInput::copy() } /*! - \qmlmethod QtQuick2::TextInput::paste() + \qmlmethod QtQuick::TextInput::paste() Replaces the currently selected text by the contents of the system clipboard. */ @@ -2006,7 +2006,7 @@ void QQuickTextInput::paste() #endif // QT_NO_CLIPBOARD /*! - \qmlmethod QtQuick2::TextInput::undo() + \qmlmethod QtQuick::TextInput::undo() Undoes the last operation if undo is \l {canUndo}{available}. Deselects any current selection, and updates the selection start to the current cursor @@ -2023,7 +2023,7 @@ void QQuickTextInput::undo() } /*! - \qmlmethod QtQuick2::TextInput::redo() + \qmlmethod QtQuick::TextInput::redo() Redoes the last operation if redo is \l {canRedo}{available}. */ @@ -2038,7 +2038,7 @@ void QQuickTextInput::redo() } /*! - \qmlmethod QtQuick2::TextInput::insert(int position, string text) + \qmlmethod QtQuick::TextInput::insert(int position, string text) Inserts \a text into the TextInput at position. */ @@ -2112,7 +2112,7 @@ void QQuickTextInput::insert(int position, const QString &text) } /*! - \qmlmethod QtQuick2::TextInput::remove(int start, int end) + \qmlmethod QtQuick::TextInput::remove(int start, int end) Removes the section of text that is between the \a start and \a end positions from the TextInput. */ @@ -2190,7 +2190,7 @@ void QQuickTextInput::remove(int start, int end) /*! - \qmlmethod QtQuick2::TextInput::selectWord() + \qmlmethod QtQuick::TextInput::selectWord() Causes the word closest to the current cursor position to be selected. */ @@ -2201,7 +2201,7 @@ void QQuickTextInput::selectWord() } /*! - \qmlproperty string QtQuick2::TextInput::passwordCharacter + \qmlproperty string QtQuick::TextInput::passwordCharacter This is the character displayed when echoMode is set to Password or PasswordEchoOnEdit. By default it is the password character used by @@ -2229,7 +2229,7 @@ void QQuickTextInput::setPasswordCharacter(const QString &str) } /*! - \qmlproperty string QtQuick2::TextInput::displayText + \qmlproperty string QtQuick::TextInput::displayText This is the text displayed in the TextInput. @@ -2247,7 +2247,7 @@ QString QQuickTextInput::displayText() const } /*! - \qmlproperty bool QtQuick2::TextInput::selectByMouse + \qmlproperty bool QtQuick::TextInput::selectByMouse Defaults to false. @@ -2272,7 +2272,7 @@ void QQuickTextInput::setSelectByMouse(bool on) } /*! - \qmlproperty enumeration QtQuick2::TextInput::mouseSelectionMode + \qmlproperty enumeration QtQuick::TextInput::mouseSelectionMode Specifies how text should be selected using a mouse. @@ -2300,7 +2300,7 @@ void QQuickTextInput::setMouseSelectionMode(SelectionMode mode) } /*! - \qmlproperty bool QtQuick2::TextInput::persistentSelection + \qmlproperty bool QtQuick::TextInput::persistentSelection Whether the TextInput should keep its selection when it loses active focus to another item in the scene. By default this is set to false; @@ -2323,7 +2323,7 @@ void QQuickTextInput::setPersistentSelection(bool on) #ifndef QT_NO_CLIPBOARD /*! - \qmlproperty bool QtQuick2::TextInput::canPaste + \qmlproperty bool QtQuick::TextInput::canPaste Returns true if the TextInput is writable and the content of the clipboard is suitable for pasting into the TextInput. @@ -2341,7 +2341,7 @@ bool QQuickTextInput::canPaste() const #endif /*! - \qmlproperty bool QtQuick2::TextInput::canUndo + \qmlproperty bool QtQuick::TextInput::canUndo Returns true if the TextInput is writable and there are previous operations that can be undone. @@ -2354,7 +2354,7 @@ bool QQuickTextInput::canUndo() const } /*! - \qmlproperty bool QtQuick2::TextInput::canRedo + \qmlproperty bool QtQuick::TextInput::canRedo Returns true if the TextInput is writable and there are \l {undo}{undone} operations that can be redone. @@ -2367,7 +2367,7 @@ bool QQuickTextInput::canRedo() const } /*! - \qmlproperty real QtQuick2::TextInput::contentWidth + \qmlproperty real QtQuick::TextInput::contentWidth Returns the width of the text, including the width past the width which is covered due to insufficient wrapping if \l wrapMode is set. @@ -2380,7 +2380,7 @@ qreal QQuickTextInput::contentWidth() const } /*! - \qmlproperty real QtQuick2::TextInput::contentHeight + \qmlproperty real QtQuick::TextInput::contentHeight 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. @@ -2399,7 +2399,7 @@ void QQuickTextInput::moveCursorSelection(int position) } /*! - \qmlmethod QtQuick2::TextInput::moveCursorSelection(int position, SelectionMode mode = TextInput.SelectCharacters) + \qmlmethod QtQuick::TextInput::moveCursorSelection(int position, SelectionMode mode = TextInput.SelectCharacters) Moves the cursor to \a position and updates the selection according to the optional \a mode parameter. (To only move the cursor, set the \l cursorPosition property.) @@ -2538,7 +2538,7 @@ void QQuickTextInput::focusOutEvent(QFocusEvent *event) #ifndef QT_NO_IM /*! - \qmlproperty bool QtQuick2::TextInput::inputMethodComposing + \qmlproperty bool QtQuick::TextInput::inputMethodComposing This property holds whether the TextInput has partial text input from an diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp index 4a5a8df370..1ea5a6f7d6 100644 --- a/src/quick/items/qquicktranslate.cpp +++ b/src/quick/items/qquicktranslate.cpp @@ -100,7 +100,7 @@ QQuickTranslate::~QQuickTranslate() { } /*! - \qmlproperty real QtQuick2::Translate::x + \qmlproperty real QtQuick::Translate::x The translation along the X axis. @@ -123,7 +123,7 @@ void QQuickTranslate::setX(qreal x) } /*! - \qmlproperty real QtQuick2::Translate::y + \qmlproperty real QtQuick::Translate::y The translation along the Y axis. @@ -198,8 +198,8 @@ QQuickScale::~QQuickScale() } /*! - \qmlproperty real QtQuick2::Scale::origin.x - \qmlproperty real QtQuick2::Scale::origin.y + \qmlproperty real QtQuick::Scale::origin.x + \qmlproperty real QtQuick::Scale::origin.y This property holds the point that the item is scaled from (that is, the point that stays fixed relative to the parent as the rest of the @@ -223,7 +223,7 @@ void QQuickScale::setOrigin(const QVector3D &point) } /*! - \qmlproperty real QtQuick2::Scale::xScale + \qmlproperty real QtQuick::Scale::xScale The scaling factor for the X axis. @@ -246,7 +246,7 @@ void QQuickScale::setXScale(qreal scale) } /*! - \qmlproperty real QtQuick2::Scale::yScale + \qmlproperty real QtQuick::Scale::yScale The scaling factor for the Y axis. @@ -347,8 +347,8 @@ QQuickRotation::~QQuickRotation() } /*! - \qmlproperty real QtQuick2::Rotation::origin.x - \qmlproperty real QtQuick2::Rotation::origin.y + \qmlproperty real QtQuick::Rotation::origin.x + \qmlproperty real QtQuick::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 @@ -371,7 +371,7 @@ void QQuickRotation::setOrigin(const QVector3D &point) } /*! - \qmlproperty real QtQuick2::Rotation::angle + \qmlproperty real QtQuick::Rotation::angle The angle to rotate, in degrees clockwise. */ @@ -391,9 +391,9 @@ void QQuickRotation::setAngle(qreal angle) } /*! - \qmlproperty real QtQuick2::Rotation::axis.x - \qmlproperty real QtQuick2::Rotation::axis.y - \qmlproperty real QtQuick2::Rotation::axis.z + \qmlproperty real QtQuick::Rotation::axis.x + \qmlproperty real QtQuick::Rotation::axis.y + \qmlproperty real QtQuick::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 diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 655ff3cf82..fd0313aed5 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2110,7 +2110,7 @@ bool QQuickWindowPrivate::dragOverThreshold(qreal d, Qt::Axis axis, QMouseEvent } /*! - \qmlproperty list<Object> QtQuick.Window2::Window::data + \qmlproperty list<Object> QtQuick.Window::Window::data \default The data property allows you to freely mix visual children, resources @@ -2659,7 +2659,7 @@ QOpenGLContext *QQuickWindow::openglContext() const */ /*! - \qmlproperty bool QtQuick.Window2::CloseEvent::accepted + \qmlproperty bool QtQuick.Window::CloseEvent::accepted This property indicates whether the application will allow the user to close the window. It is true by default. @@ -2674,7 +2674,7 @@ QOpenGLContext *QQuickWindow::openglContext() const */ /*! - \qmlsignal QtQuick.Window2::closing(CloseEvent close) + \qmlsignal QtQuick.Window::closing(CloseEvent close) \since 5.1 This signal is emitted when the user tries to close the window. @@ -3034,7 +3034,7 @@ QSGTexture *QQuickWindow::createTextureFromId(uint id, const QSize &size, Create } /*! - \qmlproperty color QtQuick.Window2::Window::color + \qmlproperty color QtQuick.Window::Window::color The background color for the window. @@ -3163,7 +3163,7 @@ void QQuickWindow::resetOpenGLState() } /*! - \qmlproperty string QtQuick.Window2::Window::title + \qmlproperty string QtQuick.Window::Window::title The window's title in the windowing system. @@ -3174,7 +3174,7 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty Qt::WindowModality QtQuick.Window2::Window::modality + \qmlproperty Qt::WindowModality QtQuick.Window::Window::modality The modality of the window. @@ -3184,7 +3184,7 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty Qt::WindowFlags QtQuick.Window2::Window::flags + \qmlproperty Qt::WindowFlags QtQuick.Window::Window::flags The window flags of the window. @@ -3197,10 +3197,10 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty int QtQuick.Window2::Window::x - \qmlproperty int QtQuick.Window2::Window::y - \qmlproperty int QtQuick.Window2::Window::width - \qmlproperty int QtQuick.Window2::Window::height + \qmlproperty int QtQuick.Window::Window::x + \qmlproperty int QtQuick.Window::Window::y + \qmlproperty int QtQuick.Window::Window::width + \qmlproperty int QtQuick.Window::Window::height Defines the window's position and size. @@ -3215,8 +3215,8 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty int QtQuick.Window2::Window::minimumWidth - \qmlproperty int QtQuick.Window2::Window::minimumHeight + \qmlproperty int QtQuick.Window::Window::minimumWidth + \qmlproperty int QtQuick.Window::Window::minimumHeight \since 5.1 Defines the window's minimum size. @@ -3226,8 +3226,8 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty int QtQuick.Window2::Window::maximumWidth - \qmlproperty int QtQuick.Window2::Window::maximumHeight + \qmlproperty int QtQuick.Window::Window::maximumWidth + \qmlproperty int QtQuick.Window::Window::maximumHeight \since 5.1 Defines the window's maximum size. @@ -3237,7 +3237,7 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty bool QtQuick.Window2::Window::visible + \qmlproperty bool QtQuick.Window::Window::visible Whether the window is visible on the screen. @@ -3247,7 +3247,7 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty QWindow::Visibility QtQuick.Window2::Window::visibility + \qmlproperty QWindow::Visibility QtQuick.Window::Window::visibility The screen-occupation state of the window. @@ -3267,7 +3267,7 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty Qt::ScreenOrientation QtQuick.Window2::Window::contentOrientation + \qmlproperty Qt::ScreenOrientation QtQuick.Window::Window::contentOrientation This is a hint to the window manager in case it needs to display additional content like popups, dialogs, status bars, or similar @@ -3288,7 +3288,7 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty real QtQuick.Window2::Window::opacity + \qmlproperty real QtQuick.Window::Window::opacity The opacity of the window. @@ -3305,7 +3305,7 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty Item QtQuick.Window2::Window::activeFocusItem + \qmlproperty Item QtQuick.Window::Window::activeFocusItem \since 5.1 The item which currently has active focus or \c null if there is @@ -3313,7 +3313,7 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlproperty QtQuick.Window2::Window::active + \qmlproperty QtQuick.Window::Window::active \since 5.1 The active status of the window. @@ -3322,14 +3322,14 @@ void QQuickWindow::resetOpenGLState() */ /*! - \qmlmethod QtQuick2::Window::requestActivate() + \qmlmethod QtQuick::Window::requestActivate() \since 5.1 Requests the window to be activated, i.e. receive keyboard focus. */ /*! - \qmlmethod QtQuick2::Window::alert(int msec) + \qmlmethod QtQuick::Window::alert(int msec) \since 5.1 Causes an alert to be shown for \a msec miliseconds. If \a msec is \c 0 (the diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 16b2af9ca8..a3578020ae 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -109,7 +109,7 @@ QAbstractAnimationJob* QQuickAbstractAnimation::qtAnimation() } /*! - \qmlproperty bool QtQuick2::Animation::running + \qmlproperty bool QtQuick::Animation::running This property holds whether the animation is currently running. The \c running property can be set to declaratively control whether or not @@ -200,7 +200,7 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const } /*! - \qmlsignal QtQuick2::Animation::onStarted() + \qmlsignal QtQuick::Animation::onStarted() This signal handler is called when the animation begins. @@ -210,7 +210,7 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const */ /*! - \qmlsignal QtQuick2::Animation::onStopped() + \qmlsignal QtQuick::Animation::onStopped() This signal handler is called when the animation ends. @@ -287,7 +287,7 @@ void QQuickAbstractAnimation::setRunning(bool r) } /*! - \qmlproperty bool QtQuick2::Animation::paused + \qmlproperty bool QtQuick::Animation::paused This property holds whether the animation is currently paused. The \c paused property can be set to declaratively control whether or not @@ -360,7 +360,7 @@ void QQuickAbstractAnimation::componentFinalized() } /*! - \qmlproperty bool QtQuick2::Animation::alwaysRunToEnd + \qmlproperty bool QtQuick::Animation::alwaysRunToEnd This property holds whether the animation should run to completion when it is stopped. If this true the animation will complete its current iteration when it @@ -392,7 +392,7 @@ void QQuickAbstractAnimation::setAlwaysRunToEnd(bool f) } /*! - \qmlproperty int QtQuick2::Animation::loops + \qmlproperty int QtQuick::Animation::loops This property holds the number of times the animation should play. By default, \c loops is 1: the animation will play through once and then stop. @@ -474,7 +474,7 @@ void QQuickAbstractAnimation::setGroup(QQuickAnimationGroup *g) } /*! - \qmlmethod QtQuick2::Animation::start() + \qmlmethod QtQuick::Animation::start() \brief Starts the animation If the animation is already running, calling this method has no effect. The @@ -486,7 +486,7 @@ void QQuickAbstractAnimation::start() } /*! - \qmlmethod QtQuick2::Animation::pause() + \qmlmethod QtQuick::Animation::pause() \brief Pauses the animation If the animation is already paused or not \c running, calling this method has no effect. @@ -498,7 +498,7 @@ void QQuickAbstractAnimation::pause() } /*! - \qmlmethod QtQuick2::Animation::resume() + \qmlmethod QtQuick::Animation::resume() \brief Resumes a paused animation If the animation is not paused or not \c running, calling this method has no effect. @@ -510,7 +510,7 @@ void QQuickAbstractAnimation::resume() } /*! - \qmlmethod QtQuick2::Animation::stop() + \qmlmethod QtQuick::Animation::stop() \brief Stops the animation If the animation is not running, calling this method has no effect. Both the @@ -535,7 +535,7 @@ void QQuickAbstractAnimation::stop() } /*! - \qmlmethod QtQuick2::Animation::restart() + \qmlmethod QtQuick::Animation::restart() \brief Restarts the animation This is a convenience method, and is equivalent to calling \c stop() and @@ -548,7 +548,7 @@ void QQuickAbstractAnimation::restart() } /*! - \qmlmethod QtQuick2::Animation::complete() + \qmlmethod QtQuick::Animation::complete() \brief Stops the animation, jumping to the final property values If the animation is not running, calling this method has no effect. The @@ -685,7 +685,7 @@ QQuickPauseAnimation::~QQuickPauseAnimation() } /*! - \qmlproperty int QtQuick2::PauseAnimation::duration + \qmlproperty int QtQuick::PauseAnimation::duration This property holds the duration of the pause in milliseconds The default value is 250. @@ -768,7 +768,7 @@ QQuickColorAnimation::~QQuickColorAnimation() } /*! - \qmlproperty color QtQuick2::ColorAnimation::from + \qmlproperty color QtQuick::ColorAnimation::from This property holds the color value at which the animation should begin. For example, the following animation is not applied until a color value @@ -805,7 +805,7 @@ void QQuickColorAnimation::setFrom(const QColor &f) } /*! - \qmlproperty color QtQuick2::ColorAnimation::to + \qmlproperty color QtQuick::ColorAnimation::to This property holds the color value at which the animation should end. @@ -911,7 +911,7 @@ QQuickScriptActionPrivate::QQuickScriptActionPrivate() : QQuickAbstractAnimationPrivate(), hasRunScriptScript(false), reversing(false){} /*! - \qmlproperty script QtQuick2::ScriptAction::script + \qmlproperty script QtQuick::ScriptAction::script This property holds the script to run. */ QQmlScriptString QQuickScriptAction::script() const @@ -927,7 +927,7 @@ void QQuickScriptAction::setScript(const QQmlScriptString &script) } /*! - \qmlproperty string QtQuick2::ScriptAction::scriptName + \qmlproperty string QtQuick::ScriptAction::scriptName This property holds the name of the StateChangeScript to run. This property is only valid when ScriptAction is used as part of a transition. @@ -1077,10 +1077,10 @@ void QQuickPropertyAction::setProperty(const QString &n) } /*! - \qmlproperty Object QtQuick2::PropertyAction::target - \qmlproperty list<Object> QtQuick2::PropertyAction::targets - \qmlproperty string QtQuick2::PropertyAction::property - \qmlproperty string QtQuick2::PropertyAction::properties + \qmlproperty Object QtQuick::PropertyAction::target + \qmlproperty list<Object> QtQuick::PropertyAction::targets + \qmlproperty string QtQuick::PropertyAction::property + \qmlproperty string QtQuick::PropertyAction::properties These properties determine the items and their properties that are affected by this action. @@ -1113,7 +1113,7 @@ QQmlListProperty<QObject> QQuickPropertyAction::targets() } /*! - \qmlproperty list<Object> QtQuick2::PropertyAction::exclude + \qmlproperty list<Object> QtQuick::PropertyAction::exclude This property holds the objects that should not be affected by this action. \sa targets @@ -1125,7 +1125,7 @@ QQmlListProperty<QObject> QQuickPropertyAction::exclude() } /*! - \qmlproperty any QtQuick2::PropertyAction::value + \qmlproperty any QtQuick::PropertyAction::value This property holds the value to be set on the property. If the PropertyAction is defined within a \l Transition or \l Behavior, @@ -1301,7 +1301,7 @@ void QQuickNumberAnimation::init() } /*! - \qmlproperty real QtQuick2::NumberAnimation::from + \qmlproperty real QtQuick::NumberAnimation::from This property holds the starting value for the animation. For example, the following animation is not applied until the \c x value @@ -1339,7 +1339,7 @@ void QQuickNumberAnimation::setFrom(qreal f) } /*! - \qmlproperty real QtQuick2::NumberAnimation::to + \qmlproperty real QtQuick::NumberAnimation::to This property holds the end value for the animation. If the NumberAnimation is defined within a \l Transition or \l Behavior, @@ -1394,7 +1394,7 @@ QQuickVector3dAnimation::~QQuickVector3dAnimation() } /*! - \qmlproperty real QtQuick2::Vector3dAnimation::from + \qmlproperty real QtQuick::Vector3dAnimation::from This property holds the starting value for the animation. If the Vector3dAnimation is defined within a \l Transition or \l Behavior, @@ -1416,7 +1416,7 @@ void QQuickVector3dAnimation::setFrom(QVector3D f) } /*! - \qmlproperty real QtQuick2::Vector3dAnimation::to + \qmlproperty real QtQuick::Vector3dAnimation::to This property holds the end value for the animation. If the Vector3dAnimation is defined within a \l Transition or \l Behavior, @@ -1531,7 +1531,7 @@ QQuickRotationAnimation::~QQuickRotationAnimation() } /*! - \qmlproperty real QtQuick2::RotationAnimation::from + \qmlproperty real QtQuick::RotationAnimation::from This property holds the starting value for the animation. For example, the following animation is not applied until the \c angle value @@ -1568,7 +1568,7 @@ void QQuickRotationAnimation::setFrom(qreal f) } /*! - \qmlproperty real QtQuick2::RotationAnimation::to + \qmlproperty real QtQuick::RotationAnimation::to This property holds the end value for the animation.. If the RotationAnimation is defined within a \l Transition or \l Behavior, @@ -1590,7 +1590,7 @@ void QQuickRotationAnimation::setTo(qreal t) } /*! - \qmlproperty enumeration QtQuick2::RotationAnimation::direction + \qmlproperty enumeration QtQuick::RotationAnimation::direction This property holds the direction of the rotation. Possible values are: @@ -2002,7 +2002,7 @@ QQuickPropertyAnimation::~QQuickPropertyAnimation() } /*! - \qmlproperty int QtQuick2::PropertyAnimation::duration + \qmlproperty int QtQuick::PropertyAnimation::duration This property holds the duration of the animation, in milliseconds. The default value is 250. @@ -2028,7 +2028,7 @@ void QQuickPropertyAnimation::setDuration(int duration) } /*! - \qmlproperty variant QtQuick2::PropertyAnimation::from + \qmlproperty variant QtQuick::PropertyAnimation::from This property holds the starting value for the animation. If the PropertyAnimation is defined within a \l Transition or \l Behavior, @@ -2055,7 +2055,7 @@ void QQuickPropertyAnimation::setFrom(const QVariant &f) } /*! - \qmlproperty variant QtQuick2::PropertyAnimation::to + \qmlproperty variant QtQuick::PropertyAnimation::to This property holds the end value for the animation. If the PropertyAnimation is defined within a \l Transition or \l Behavior, @@ -2082,11 +2082,11 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) } /*! - \qmlproperty enumeration QtQuick2::PropertyAnimation::easing.type - \qmlproperty real QtQuick2::PropertyAnimation::easing.amplitude - \qmlproperty real QtQuick2::PropertyAnimation::easing.overshoot - \qmlproperty real QtQuick2::PropertyAnimation::easing.period - \qmlproperty list<real> QtQuick2::PropertyAnimation::easing.bezierCurve + \qmlproperty enumeration QtQuick::PropertyAnimation::easing.type + \qmlproperty real QtQuick::PropertyAnimation::easing.amplitude + \qmlproperty real QtQuick::PropertyAnimation::easing.overshoot + \qmlproperty real QtQuick::PropertyAnimation::easing.period + \qmlproperty list<real> QtQuick::PropertyAnimation::easing.bezierCurve //! propertyanimation.easing \brief Specifies the easing curve used for the animation @@ -2355,10 +2355,10 @@ void QQuickPropertyAnimation::setProperties(const QString &prop) } /*! - \qmlproperty string QtQuick2::PropertyAnimation::properties - \qmlproperty list<Object> QtQuick2::PropertyAnimation::targets - \qmlproperty string QtQuick2::PropertyAnimation::property - \qmlproperty Object QtQuick2::PropertyAnimation::target + \qmlproperty string QtQuick::PropertyAnimation::properties + \qmlproperty list<Object> QtQuick::PropertyAnimation::targets + \qmlproperty string QtQuick::PropertyAnimation::property + \qmlproperty Object QtQuick::PropertyAnimation::target These properties are used as a set to determine which properties should be animated. The singular and plural forms are functionally identical, e.g. @@ -2451,7 +2451,7 @@ QQmlListProperty<QObject> QQuickPropertyAnimation::targets() } /*! - \qmlproperty list<Object> QtQuick2::PropertyAnimation::exclude + \qmlproperty list<Object> QtQuick::PropertyAnimation::exclude This property holds the items not to be affected by this animation. \sa PropertyAnimation::targets */ diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp index ac2075df44..0214dde597 100644 --- a/src/quick/util/qquickanimationcontroller.cpp +++ b/src/quick/util/qquickanimationcontroller.cpp @@ -117,7 +117,7 @@ QQuickAnimationController::~QQuickAnimationController() } /*! - \qmlproperty real QtQuick2::AnimationController::progress + \qmlproperty real QtQuick::AnimationController::progress This property holds the animation progress value. The valid \c progress value is 0.0 to 1.0, setting values less than 0 will be converted to 0, @@ -142,7 +142,7 @@ void QQuickAnimationController::setProgress(qreal progress) } /*! - \qmlproperty real QtQuick2::AnimationController::animation + \qmlproperty real QtQuick::AnimationController::animation \default This property holds the animation to be controlled by the AnimationController. @@ -187,7 +187,7 @@ void QQuickAnimationController::setAnimation(QQuickAbstractAnimation *animation) } /*! - \qmlmethod QtQuick2::AnimationController::reload() + \qmlmethod QtQuick::AnimationController::reload() \brief Reloads the animation properties If the animation properties changed, calling this method to reload the animation definations. @@ -237,7 +237,7 @@ void QQuickAnimationController::componentFinalized() } /*! - \qmlmethod QtQuick2::AnimationController::completeToBeginning() + \qmlmethod QtQuick::AnimationController::completeToBeginning() \brief Finishes running the controlled animation in a backwards direction. After calling this method, the animation runs normally from the current progress point @@ -266,7 +266,7 @@ void QQuickAnimationController::completeToBeginning() } /*! - \qmlmethod QtQuick2::AnimationController::completeToEnd() + \qmlmethod QtQuick::AnimationController::completeToEnd() \brief Finishes running the controlled animation in a forwards direction. After calling this method, the animation runs normally from the current progress point diff --git a/src/quick/util/qquickanimator.cpp b/src/quick/util/qquickanimator.cpp index 59e2d8c39a..592b6a0138 100644 --- a/src/quick/util/qquickanimator.cpp +++ b/src/quick/util/qquickanimator.cpp @@ -90,7 +90,7 @@ QQuickAnimator::QQuickAnimator(QObject *parent) } /*! - \qmlproperty QtQuick2::Item QtQuick2::Animator::target + \qmlproperty QtQuick::Item QtQuick::Animator::target This property holds the target item of the animator. @@ -113,7 +113,7 @@ QQuickItem *QQuickAnimator::targetItem() const } /*! - \qmlproperty int QtQuick2::Animator::duration + \qmlproperty int QtQuick::Animator::duration This property holds the duration of the animation in milliseconds. The default value is 250. @@ -134,12 +134,12 @@ int QQuickAnimator::duration() const } /*! - \qmlpropertygroup QtQuick2::Animator::easing - \qmlproperty enumeration QtQuick2::Animator::easing.type - \qmlproperty real QtQuick2::Animator::easing.amplitude - \qmlproperty real QtQuick2::Animator::easing.overshoot - \qmlproperty real QtQuick2::Animator::easing.period - \qmlproperty list<real> QtQuick2::Animator::easing.bezierCurve + \qmlpropertygroup QtQuick::Animator::easing + \qmlproperty enumeration QtQuick::Animator::easing.type + \qmlproperty real QtQuick::Animator::easing.amplitude + \qmlproperty real QtQuick::Animator::easing.overshoot + \qmlproperty real QtQuick::Animator::easing.period + \qmlproperty list<real> QtQuick::Animator::easing.bezierCurve \include qquickanimation.cpp propertyanimation.easing */ @@ -159,7 +159,7 @@ QEasingCurve QQuickAnimator::easing() const } /*! - \qmlproperty real QtQuick2::Animator::to + \qmlproperty real QtQuick::Animator::to This property holds the end value for the animation. If the Animator is defined within a \l Transition or \l Behavior, @@ -185,7 +185,7 @@ qreal QQuickAnimator::to() const } /*! - \qmlproperty real QtQuick2::Animator::from + \qmlproperty real QtQuick::Animator::from This property holds the starting value for the animation. If the Animator is defined within a \l Transition or \l Behavior, @@ -456,7 +456,7 @@ QQuickAnimatorJob *QQuickRotationAnimator::createJob() const { } /*! - \qmlproperty enumeration QtQuick2::RotationAnimator::direction + \qmlproperty enumeration QtQuick::RotationAnimator::direction This property holds the direction of the rotation. Possible values are: @@ -521,7 +521,7 @@ QQuickUniformAnimator::QQuickUniformAnimator(QObject *parent) } /*! - \qmlproperty string QtQuick2::UniformAnimator::uniform + \qmlproperty string QtQuick::UniformAnimator::uniform This property holds the name of the uniform to animate. The value of the uniform must correspond to both a property diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp index 571f8b88c5..69ebb22f0d 100644 --- a/src/quick/util/qquickbehavior.cpp +++ b/src/quick/util/qquickbehavior.cpp @@ -115,7 +115,7 @@ QQuickBehavior::~QQuickBehavior() } /*! - \qmlproperty Animation QtQuick2::Behavior::animation + \qmlproperty Animation QtQuick::Behavior::animation \default This property holds the animation to run when the behavior is triggered. @@ -150,7 +150,7 @@ void QQuickBehaviorPrivate::animationStateChanged(QAbstractAnimationJob *, QAbst } /*! - \qmlproperty bool QtQuick2::Behavior::enabled + \qmlproperty bool QtQuick::Behavior::enabled This property holds whether the behavior will be triggered when the tracked property changes value. diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index b3f5615864..c0672359ef 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -182,7 +182,7 @@ QQuickFontLoader::~QQuickFontLoader() } /*! - \qmlproperty url QtQuick2::FontLoader::source + \qmlproperty url QtQuick::FontLoader::source The url of the font to load. */ QUrl QQuickFontLoader::source() const @@ -253,7 +253,7 @@ void QQuickFontLoader::updateFontInfo(const QString& name, QQuickFontLoader::Sta } /*! - \qmlproperty string QtQuick2::FontLoader::name + \qmlproperty string QtQuick::FontLoader::name This property holds the name of the font family. It is set automatically when a font is loaded using the \c url property. @@ -294,7 +294,7 @@ void QQuickFontLoader::setName(const QString &name) } /*! - \qmlproperty enumeration QtQuick2::FontLoader::status + \qmlproperty enumeration QtQuick::FontLoader::status This property holds the status of font loading. It can be one of: \list diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp index cf95364f55..25e40d8eb6 100644 --- a/src/quick/util/qquickpath.cpp +++ b/src/quick/util/qquickpath.cpp @@ -93,8 +93,8 @@ QQuickPath::~QQuickPath() } /*! - \qmlproperty real QtQuick2::Path::startX - \qmlproperty real QtQuick2::Path::startY + \qmlproperty real QtQuick::Path::startX + \qmlproperty real QtQuick::Path::startY These properties hold the starting position of the path. */ qreal QQuickPath::startX() const @@ -142,7 +142,7 @@ bool QQuickPath::hasStartY() const } /*! - \qmlproperty bool QtQuick2::Path::closed + \qmlproperty bool QtQuick::Path::closed This property holds whether the start and end of the path are identical. */ bool QQuickPath::isClosed() const @@ -166,7 +166,7 @@ bool QQuickPath::hasEnd() const } /*! - \qmlproperty list<PathElement> QtQuick2::Path::pathElements + \qmlproperty list<PathElement> QtQuick::Path::pathElements This property holds the objects composing the path. \default @@ -919,7 +919,7 @@ bool QQuickCurve::hasRelativeY() */ /*! - \qmlproperty string QtQuick2::PathAttribute::name + \qmlproperty string QtQuick::PathAttribute::name This property holds the name of the attribute to change. This attribute will be available to the delegate as PathView.<name> @@ -948,7 +948,7 @@ void QQuickPathAttribute::setName(const QString &name) } /*! - \qmlproperty real QtQuick2::PathAttribute::value + \qmlproperty real QtQuick::PathAttribute::value This property holds the value for the attribute. The value specified can be used to influence the visual appearance @@ -1023,8 +1023,8 @@ void QQuickPathAttribute::setValue(qreal value) */ /*! - \qmlproperty real QtQuick2::PathLine::x - \qmlproperty real QtQuick2::PathLine::y + \qmlproperty real QtQuick::PathLine::x + \qmlproperty real QtQuick::PathLine::y Defines the end point of the line. @@ -1032,8 +1032,8 @@ void QQuickPathAttribute::setValue(qreal value) */ /*! - \qmlproperty real QtQuick2::PathLine::relativeX - \qmlproperty real QtQuick2::PathLine::relativeY + \qmlproperty real QtQuick::PathLine::relativeX + \qmlproperty real QtQuick::PathLine::relativeY Defines the end point of the line relative to its start. @@ -1085,8 +1085,8 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathQuad::x - \qmlproperty real QtQuick2::PathQuad::y + \qmlproperty real QtQuick::PathQuad::x + \qmlproperty real QtQuick::PathQuad::y Defines the end point of the curve. @@ -1094,8 +1094,8 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathQuad::relativeX - \qmlproperty real QtQuick2::PathQuad::relativeY + \qmlproperty real QtQuick::PathQuad::relativeX + \qmlproperty real QtQuick::PathQuad::relativeY Defines the end point of the curve relative to its start. @@ -1109,8 +1109,8 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathQuad::controlX - \qmlproperty real QtQuick2::PathQuad::controlY + \qmlproperty real QtQuick::PathQuad::controlX + \qmlproperty real QtQuick::PathQuad::controlY Defines the position of the control point. */ @@ -1151,8 +1151,8 @@ void QQuickPathQuad::setControlY(qreal y) } /*! - \qmlproperty real QtQuick2::PathQuad::relativeControlX - \qmlproperty real QtQuick2::PathQuad::relativeControlY + \qmlproperty real QtQuick::PathQuad::relativeControlX + \qmlproperty real QtQuick::PathQuad::relativeControlY Defines the position of the control point relative to the curve's start. @@ -1241,8 +1241,8 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCubic::x - \qmlproperty real QtQuick2::PathCubic::y + \qmlproperty real QtQuick::PathCubic::x + \qmlproperty real QtQuick::PathCubic::y Defines the end point of the curve. @@ -1250,8 +1250,8 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCubic::relativeX - \qmlproperty real QtQuick2::PathCubic::relativeY + \qmlproperty real QtQuick::PathCubic::relativeX + \qmlproperty real QtQuick::PathCubic::relativeY Defines the end point of the curve relative to its start. @@ -1265,8 +1265,8 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCubic::control1X - \qmlproperty real QtQuick2::PathCubic::control1Y + \qmlproperty real QtQuick::PathCubic::control1X + \qmlproperty real QtQuick::PathCubic::control1Y Defines the position of the first control point. */ @@ -1299,8 +1299,8 @@ void QQuickPathCubic::setControl1Y(qreal y) } /*! - \qmlproperty real QtQuick2::PathCubic::control2X - \qmlproperty real QtQuick2::PathCubic::control2Y + \qmlproperty real QtQuick::PathCubic::control2X + \qmlproperty real QtQuick::PathCubic::control2Y Defines the position of the second control point. */ @@ -1333,10 +1333,10 @@ void QQuickPathCubic::setControl2Y(qreal y) } /*! - \qmlproperty real QtQuick2::PathCubic::relativeControl1X - \qmlproperty real QtQuick2::PathCubic::relativeControl1Y - \qmlproperty real QtQuick2::PathCubic::relativeControl2X - \qmlproperty real QtQuick2::PathCubic::relativeControl2Y + \qmlproperty real QtQuick::PathCubic::relativeControl1X + \qmlproperty real QtQuick::PathCubic::relativeControl1Y + \qmlproperty real QtQuick::PathCubic::relativeControl2X + \qmlproperty real QtQuick::PathCubic::relativeControl2Y Defines the positions of the control points relative to the curve's start. @@ -1458,8 +1458,8 @@ void QQuickPathCubic::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCurve::x - \qmlproperty real QtQuick2::PathCurve::y + \qmlproperty real QtQuick::PathCurve::x + \qmlproperty real QtQuick::PathCurve::y Defines the end point of the curve. @@ -1467,8 +1467,8 @@ void QQuickPathCubic::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCurve::relativeX - \qmlproperty real QtQuick2::PathCurve::relativeY + \qmlproperty real QtQuick::PathCurve::relativeX + \qmlproperty real QtQuick::PathCurve::relativeY Defines the end point of the curve relative to its start. @@ -1607,8 +1607,8 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa */ /*! - \qmlproperty real QtQuick2::PathArc::x - \qmlproperty real QtQuick2::PathArc::y + \qmlproperty real QtQuick::PathArc::x + \qmlproperty real QtQuick::PathArc::y Defines the end point of the arc. @@ -1616,8 +1616,8 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa */ /*! - \qmlproperty real QtQuick2::PathArc::relativeX - \qmlproperty real QtQuick2::PathArc::relativeY + \qmlproperty real QtQuick::PathArc::relativeX + \qmlproperty real QtQuick::PathArc::relativeY Defines the end point of the arc relative to its start. @@ -1631,8 +1631,8 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa */ /*! - \qmlproperty real QtQuick2::PathArc::radiusX - \qmlproperty real QtQuick2::PathArc::radiusY + \qmlproperty real QtQuick::PathArc::radiusX + \qmlproperty real QtQuick::PathArc::radiusY Defines the radius of the arc. @@ -1674,7 +1674,7 @@ void QQuickPathArc::setRadiusY(qreal radius) } /*! - \qmlproperty bool QtQuick2::PathArc::useLargeArc + \qmlproperty bool QtQuick::PathArc::useLargeArc Whether to use a large arc as defined by the arc points. Given fixed start and end positions, radius, and direction, @@ -1707,7 +1707,7 @@ void QQuickPathArc::setUseLargeArc(bool largeArc) } /*! - \qmlproperty enumeration QtQuick2::PathArc::direction + \qmlproperty enumeration QtQuick::PathArc::direction Defines the direction of the arc. Possible values are PathArc.Clockwise (default) and PathArc.Counterclockwise. @@ -1778,7 +1778,7 @@ void QQuickPathArc::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty string QtQuick2::PathSvg::path + \qmlproperty string QtQuick::PathSvg::path The SVG path data string specifying the path. @@ -1859,7 +1859,7 @@ void QQuickPathSvg::addToPath(QPainterPath &path, const QQuickPathData &) */ /*! - \qmlproperty real QtQuick2::PathPercent::value + \qmlproperty real QtQuick::PathPercent::value The proportion 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/quick/util/qquickpathinterpolator.cpp b/src/quick/util/qquickpathinterpolator.cpp index 78a22ec111..09bebebf05 100644 --- a/src/quick/util/qquickpathinterpolator.cpp +++ b/src/quick/util/qquickpathinterpolator.cpp @@ -66,7 +66,7 @@ QQuickPathInterpolator::QQuickPathInterpolator(QObject *parent) : } /*! - \qmlproperty Path QtQuick2::PathInterpolator::path + \qmlproperty Path QtQuick::PathInterpolator::path This property holds the path to interpolate. For more information on defining a path see the \l Path documentation. @@ -88,7 +88,7 @@ void QQuickPathInterpolator::setPath(QQuickPath *path) } /*! - \qmlproperty real QtQuick2::PathInterpolator::progress + \qmlproperty real QtQuick::PathInterpolator::progress This property holds the current progress along the path. Typical usage of PathInterpolator is to set the progress @@ -114,8 +114,8 @@ void QQuickPathInterpolator::setProgress(qreal progress) } /*! - \qmlproperty real QtQuick2::PathInterpolator::x - \qmlproperty real QtQuick2::PathInterpolator::y + \qmlproperty real QtQuick::PathInterpolator::x + \qmlproperty real QtQuick::PathInterpolator::y These properties hold the position of the path at \l progress. */ @@ -130,7 +130,7 @@ qreal QQuickPathInterpolator::y() const } /*! - \qmlproperty real QtQuick2::PathInterpolator::angle + \qmlproperty real QtQuick::PathInterpolator::angle This property holds the angle of the path tangent at \l progress. diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index 04547b1ac9..cada612248 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -131,7 +131,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty Object QtQuick2::PropertyChanges::target + \qmlproperty Object QtQuick::PropertyChanges::target This property holds the object which contains the properties to be changed. */ @@ -400,7 +400,7 @@ void QQuickPropertyChanges::setObject(QObject *o) } /*! - \qmlproperty bool QtQuick2::PropertyChanges::restoreEntryValues + \qmlproperty bool QtQuick::PropertyChanges::restoreEntryValues This property holds whether the previous values should be restored when leaving the state. @@ -504,7 +504,7 @@ QQuickPropertyChanges::ActionList QQuickPropertyChanges::actions() } /*! - \qmlproperty bool QtQuick2::PropertyChanges::explicit + \qmlproperty bool QtQuick::PropertyChanges::explicit If explicit is set to true, any potential bindings will be interpreted as once-off assignments that occur when the state is entered. diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp index 4819bf6469..53e3520bde 100644 --- a/src/quick/util/qquicksmoothedanimation.cpp +++ b/src/quick/util/qquicksmoothedanimation.cpp @@ -444,7 +444,7 @@ QAbstractAnimationJob* QQuickSmoothedAnimation::transition(QQuickStateActions &a } /*! - \qmlproperty enumeration QtQuick2::SmoothedAnimation::reversingMode + \qmlproperty enumeration QtQuick::SmoothedAnimation::reversingMode Sets how the SmoothedAnimation behaves if an animation direction is reversed. @@ -474,7 +474,7 @@ void QQuickSmoothedAnimation::setReversingMode(ReversingMode m) } /*! - \qmlproperty int QtQuick2::SmoothedAnimation::duration + \qmlproperty int QtQuick::SmoothedAnimation::duration This property holds the animation duration, in msecs, used when tracking the source. @@ -507,7 +507,7 @@ qreal QQuickSmoothedAnimation::velocity() const } /*! - \qmlproperty real QtQuick2::SmoothedAnimation::velocity + \qmlproperty real QtQuick::SmoothedAnimation::velocity This property holds the average velocity allowed when tracking the 'to' value. @@ -530,7 +530,7 @@ void QQuickSmoothedAnimation::setVelocity(qreal v) } /*! - \qmlproperty int QtQuick2::SmoothedAnimation::maximumEasingTime + \qmlproperty int QtQuick::SmoothedAnimation::maximumEasingTime This property specifies the maximum time, in msecs, any "eases" during the follow should take. Setting this property causes the velocity to "level out" after at a time. Setting diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp index 0568879382..f663491a58 100644 --- a/src/quick/util/qquickspringanimation.cpp +++ b/src/quick/util/qquickspringanimation.cpp @@ -383,7 +383,7 @@ QQuickSpringAnimation::~QQuickSpringAnimation() } /*! - \qmlproperty real QtQuick2::SpringAnimation::velocity + \qmlproperty real QtQuick::SpringAnimation::velocity This property holds the maximum velocity allowed when tracking the source. @@ -405,7 +405,7 @@ void QQuickSpringAnimation::setVelocity(qreal velocity) } /*! - \qmlproperty real QtQuick2::SpringAnimation::spring + \qmlproperty real QtQuick::SpringAnimation::spring This property describes how strongly the target is pulled towards the source. The default value is 0 (that is, the spring-like motion is disabled). @@ -429,7 +429,7 @@ void QQuickSpringAnimation::setSpring(qreal spring) } /*! - \qmlproperty real QtQuick2::SpringAnimation::damping + \qmlproperty real QtQuick::SpringAnimation::damping This property holds the spring damping value. This value describes how quickly the spring-like motion comes to rest. @@ -455,7 +455,7 @@ void QQuickSpringAnimation::setDamping(qreal damping) /*! - \qmlproperty real QtQuick2::SpringAnimation::epsilon + \qmlproperty real QtQuick::SpringAnimation::epsilon This property holds the spring epsilon. The epsilon is the rate and amount of change in the value which is close enough @@ -477,7 +477,7 @@ void QQuickSpringAnimation::setEpsilon(qreal epsilon) } /*! - \qmlproperty real QtQuick2::SpringAnimation::modulus + \qmlproperty real QtQuick::SpringAnimation::modulus This property holds the modulus value. The default value is 0. Setting a \a modulus forces the target value to "wrap around" at the modulus. @@ -501,7 +501,7 @@ void QQuickSpringAnimation::setModulus(qreal modulus) } /*! - \qmlproperty real QtQuick2::SpringAnimation::mass + \qmlproperty real QtQuick::SpringAnimation::mass This property holds the "mass" of the property being moved. The value is 1.0 by default. diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp index 1b8f0c0b65..504b5981c4 100644 --- a/src/quick/util/qquickstate.cpp +++ b/src/quick/util/qquickstate.cpp @@ -168,7 +168,7 @@ QQuickState::~QQuickState() } /*! - \qmlproperty string QtQuick2::State::name + \qmlproperty string QtQuick::State::name This property holds the name of the state. Each state should have a unique name within its item. @@ -199,7 +199,7 @@ bool QQuickState::isWhenKnown() const } /*! - \qmlproperty bool QtQuick2::State::when + \qmlproperty bool QtQuick::State::when This property holds when the state should be applied. This should be set to an expression that evaluates to \c true when you want the state to @@ -237,7 +237,7 @@ void QQuickState::setWhen(QQmlBinding *when) } /*! - \qmlproperty string QtQuick2::State::extend + \qmlproperty string QtQuick::State::extend This property holds the state that this state extends. When a state extends another state, it inherits all the changes of that state. @@ -258,7 +258,7 @@ void QQuickState::setExtends(const QString &extends) } /*! - \qmlproperty list<Change> QtQuick2::State::changes + \qmlproperty list<Change> QtQuick::State::changes This property holds the changes to apply for this state \default diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp index c52cd95ac1..51b379195d 100644 --- a/src/quick/util/qquickstatechangescript.cpp +++ b/src/quick/util/qquickstatechangescript.cpp @@ -92,7 +92,7 @@ QQuickStateChangeScript::~QQuickStateChangeScript() } /*! - \qmlproperty script QtQuick2::StateChangeScript::script + \qmlproperty script QtQuick::StateChangeScript::script This property holds the script to run when the state is current. */ QQmlScriptString QQuickStateChangeScript::script() const @@ -108,7 +108,7 @@ void QQuickStateChangeScript::setScript(const QQmlScriptString &s) } /*! - \qmlproperty string QtQuick2::StateChangeScript::name + \qmlproperty string QtQuick::StateChangeScript::name This property holds the name of the script. This name can be used by a ScriptAction to target a specific script. diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp index 20937f1bbc..779b08ef3e 100644 --- a/src/quick/util/qquickstategroup.cpp +++ b/src/quick/util/qquickstategroup.cpp @@ -141,7 +141,7 @@ QList<QQuickState *> QQuickStateGroup::states() const } /*! - \qmlproperty list<State> QtQuick2::StateGroup::states + \qmlproperty list<State> QtQuick::StateGroup::states This property holds a list of states defined by the state group. \qml @@ -202,7 +202,7 @@ void QQuickStateGroupPrivate::clear_states(QQmlListProperty<QQuickState> *list) } /*! - \qmlproperty list<Transition> QtQuick2::StateGroup::transitions + \qmlproperty list<Transition> QtQuick::StateGroup::transitions This property holds a list of transitions defined by the state group. \qml @@ -256,7 +256,7 @@ void QQuickStateGroupPrivate::clear_transitions(QQmlListProperty<QQuickTransitio } /*! - \qmlproperty string QtQuick2::StateGroup::state + \qmlproperty string QtQuick::StateGroup::state This property holds the name of the current state of the state group. diff --git a/src/quick/util/qquicksystempalette.cpp b/src/quick/util/qquicksystempalette.cpp index bd651e1a73..515bf28c2f 100644 --- a/src/quick/util/qquicksystempalette.cpp +++ b/src/quick/util/qquicksystempalette.cpp @@ -95,7 +95,7 @@ QQuickSystemPalette::~QQuickSystemPalette() } /*! - \qmlproperty color QtQuick2::SystemPalette::window + \qmlproperty color QtQuick::SystemPalette::window The window (general background) color of the current color group. \sa QPalette::ColorRole @@ -107,7 +107,7 @@ QColor QQuickSystemPalette::window() const } /*! - \qmlproperty color QtQuick2::SystemPalette::windowText + \qmlproperty color QtQuick::SystemPalette::windowText The window text (general foreground) color of the current color group. \sa QPalette::ColorRole @@ -119,7 +119,7 @@ QColor QQuickSystemPalette::windowText() const } /*! - \qmlproperty color QtQuick2::SystemPalette::base + \qmlproperty color QtQuick::SystemPalette::base The base color of the current color group. \sa QPalette::ColorRole @@ -131,7 +131,7 @@ QColor QQuickSystemPalette::base() const } /*! - \qmlproperty color QtQuick2::SystemPalette::text + \qmlproperty color QtQuick::SystemPalette::text The text color of the current color group. \sa QPalette::ColorRole @@ -143,7 +143,7 @@ QColor QQuickSystemPalette::text() const } /*! - \qmlproperty color QtQuick2::SystemPalette::alternateBase + \qmlproperty color QtQuick::SystemPalette::alternateBase The alternate base color of the current color group. \sa QPalette::ColorRole @@ -155,7 +155,7 @@ QColor QQuickSystemPalette::alternateBase() const } /*! - \qmlproperty color QtQuick2::SystemPalette::button + \qmlproperty color QtQuick::SystemPalette::button The button color of the current color group. \sa QPalette::ColorRole @@ -167,7 +167,7 @@ QColor QQuickSystemPalette::button() const } /*! - \qmlproperty color QtQuick2::SystemPalette::buttonText + \qmlproperty color QtQuick::SystemPalette::buttonText The button text foreground color of the current color group. \sa QPalette::ColorRole @@ -179,7 +179,7 @@ QColor QQuickSystemPalette::buttonText() const } /*! - \qmlproperty color QtQuick2::SystemPalette::light + \qmlproperty color QtQuick::SystemPalette::light The light color of the current color group. \sa QPalette::ColorRole @@ -191,7 +191,7 @@ QColor QQuickSystemPalette::light() const } /*! - \qmlproperty color QtQuick2::SystemPalette::midlight + \qmlproperty color QtQuick::SystemPalette::midlight The midlight color of the current color group. \sa QPalette::ColorRole @@ -203,7 +203,7 @@ QColor QQuickSystemPalette::midlight() const } /*! - \qmlproperty color QtQuick2::SystemPalette::dark + \qmlproperty color QtQuick::SystemPalette::dark The dark color of the current color group. \sa QPalette::ColorRole @@ -215,7 +215,7 @@ QColor QQuickSystemPalette::dark() const } /*! - \qmlproperty color QtQuick2::SystemPalette::mid + \qmlproperty color QtQuick::SystemPalette::mid The mid color of the current color group. \sa QPalette::ColorRole @@ -227,7 +227,7 @@ QColor QQuickSystemPalette::mid() const } /*! - \qmlproperty color QtQuick2::SystemPalette::shadow + \qmlproperty color QtQuick::SystemPalette::shadow The shadow color of the current color group. \sa QPalette::ColorRole @@ -239,7 +239,7 @@ QColor QQuickSystemPalette::shadow() const } /*! - \qmlproperty color QtQuick2::SystemPalette::highlight + \qmlproperty color QtQuick::SystemPalette::highlight The highlight color of the current color group. \sa QPalette::ColorRole @@ -251,7 +251,7 @@ QColor QQuickSystemPalette::highlight() const } /*! - \qmlproperty color QtQuick2::SystemPalette::highlightedText + \qmlproperty color QtQuick::SystemPalette::highlightedText The highlighted text color of the current color group. \sa QPalette::ColorRole @@ -263,7 +263,7 @@ QColor QQuickSystemPalette::highlightedText() const } /*! - \qmlproperty enumeration QtQuick2::SystemPalette::colorGroup + \qmlproperty enumeration QtQuick::SystemPalette::colorGroup The color group of the palette. This can be one of: diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp index 75524c190f..dcfc4549c2 100644 --- a/src/quick/util/qquicktransition.cpp +++ b/src/quick/util/qquicktransition.cpp @@ -278,8 +278,8 @@ QQuickTransitionInstance *QQuickTransition::prepare(QQuickStateOperation::Action } /*! - \qmlproperty string QtQuick2::Transition::from - \qmlproperty string QtQuick2::Transition::to + \qmlproperty string QtQuick::Transition::from + \qmlproperty string QtQuick::Transition::to These properties indicate the state changes that trigger the transition. @@ -319,7 +319,7 @@ void QQuickTransition::setFromState(const QString &f) } /*! - \qmlproperty bool QtQuick2::Transition::reversible + \qmlproperty bool QtQuick::Transition::reversible This property holds whether the transition should be automatically reversed when the conditions that triggered this transition are reversed. The default value is false. @@ -375,7 +375,7 @@ void QQuickTransition::setToState(const QString &t) } /*! - \qmlproperty bool QtQuick2::Transition::enabled + \qmlproperty bool QtQuick::Transition::enabled This property holds whether the Transition will be run when moving from the \c from state to the \c to state. @@ -421,7 +421,7 @@ void QQuickTransition::setEnabled(bool enabled) } /*! - \qmlproperty bool QtQuick2::Transition::running + \qmlproperty bool QtQuick::Transition::running This property holds whether the transition is currently running. @@ -435,7 +435,7 @@ bool QQuickTransition::running() const /*! - \qmlproperty list<Animation> QtQuick2::Transition::animations + \qmlproperty list<Animation> QtQuick::Transition::animations \default This property holds a list of the animations to be run for this transition. |