diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
| commit | c80eb38354854f2ccc7ea070a9857409acc36792 (patch) | |
| tree | 806cb68b337ac7c8ab8f9a48538e6e0211f57ed8 /src/quickshapes | |
| parent | d38bac596946c3dd9cce3c0b4127509421dc917d (diff) | |
| parent | f19ec4561b4975d68290593b599d3c38d0f9f6d3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/qml/jsruntime/qv4engine.cpp
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/qquicktableview.cpp
Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Done-With: Shawn Rutledge <shawn.rutledge@qt.io>
Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd
Diffstat (limited to 'src/quickshapes')
| -rw-r--r-- | src/quickshapes/qquickshape.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quickshapes/qquickshape.cpp b/src/quickshapes/qquickshape.cpp index c1deb0dced..a7db65f16f 100644 --- a/src/quickshapes/qquickshape.cpp +++ b/src/quickshapes/qquickshape.cpp @@ -90,7 +90,7 @@ QQuickShapeStrokeFillParams::QQuickShapeStrokeFillParams() /*! \qmltype ShapePath - \instantiates QQuickShapePath + //! \instantiates QQuickShapePath \inqmlmodule QtQuick.Shapes \ingroup qtquick-paths \ingroup qtquick-views @@ -517,7 +517,7 @@ void QQuickShapePath::resetFillGradient() /*! \qmltype Shape - \instantiates QQuickShape + //! \instantiates QQuickShape \inqmlmodule QtQuick.Shapes \ingroup qtquick-paths \ingroup qtquick-views @@ -1142,7 +1142,7 @@ void QQuickShapePrivate::sync() /*! \qmltype ShapeGradient - \instantiates QQuickShapeGradient + //! \instantiates QQuickShapeGradient \inqmlmodule QtQuick.Shapes \ingroup qtquick-paths \ingroup qtquick-views @@ -1193,7 +1193,7 @@ void QQuickShapeGradient::setSpread(SpreadMode mode) /*! \qmltype LinearGradient - \instantiates QQuickShapeLinearGradient + //! \instantiates QQuickShapeLinearGradient \inqmlmodule QtQuick.Shapes \ingroup qtquick-paths \ingroup qtquick-views @@ -1284,7 +1284,7 @@ void QQuickShapeLinearGradient::setY2(qreal v) /*! \qmltype RadialGradient - \instantiates QQuickShapeRadialGradient + //! \instantiates QQuickShapeRadialGradient \inqmlmodule QtQuick.Shapes \ingroup qtquick-paths \ingroup qtquick-views @@ -1437,7 +1437,7 @@ void QQuickShapeRadialGradient::setFocalRadius(qreal v) /*! \qmltype ConicalGradient - \instantiates QQuickShapeConicalGradient + //! \instantiates QQuickShapeConicalGradient \inqmlmodule QtQuick.Shapes \ingroup qtquick-paths \ingroup qtquick-views |