diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-02 03:03:33 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-02 03:03:33 +0200 |
| commit | c6fe3e3be58efa4002876ad2b5c811355d1b21f0 (patch) | |
| tree | d2b0916b9ca471b1b92668d1d9b36d34057b233a | |
| parent | dffbc2b18883630e4d47281145428bcc999bc490 (diff) | |
| parent | 085275b92a55a21cbcf8d307a6f52804875deedd (diff) | |
| download | qtgraphicaleffects-c6fe3e3be58efa4002876ad2b5c811355d1b21f0.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I8625ae652f6e6f44ecc6922b0185395a9ec4c186
| -rw-r--r-- | src/effects/RadialGradient.qml | 10 | ||||
| -rw-r--r-- | src/effects/doc/qtgraphicaleffects.qdocconf | 1 | ||||
| -rw-r--r-- | src/effects/doc/src/overview-graphicaleffects.qdoc | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/effects/RadialGradient.qml b/src/effects/RadialGradient.qml index ff46aac..52b3ff3 100644 --- a/src/effects/RadialGradient.qml +++ b/src/effects/RadialGradient.qml @@ -85,7 +85,10 @@ Item { property bool cached: false /*! - The HorizontalOffset and verticalOffset properties define the offset in + \qmlproperty real RadialGradient::horizontalOffset + \qmlproperty real RadialGradient::verticalOffset + + The horizontalOffset and verticalOffset properties define the offset in pixels for the center point of the gradient compared to the item center. The values range from -inf to inf. By default, these properties are set @@ -127,7 +130,10 @@ Item { property real verticalOffset: 0.0 /*! - The HorizontalRadius and verticalRadius properties define the shape and + \qmlproperty real RadialGradient::horizontalRadius + \qmlproperty real RadialGradient::verticalRadius + + The horizontalRadius and verticalRadius properties define the shape and size of the radial gradient. If the radiuses are equal, the shape of the gradient is a circle. If the horizontal and vertical radiuses differ, the shape is elliptical. The radiuses are given in pixels. diff --git a/src/effects/doc/qtgraphicaleffects.qdocconf b/src/effects/doc/qtgraphicaleffects.qdocconf index c3c8754..837929e 100644 --- a/src/effects/doc/qtgraphicaleffects.qdocconf +++ b/src/effects/doc/qtgraphicaleffects.qdocconf @@ -3,6 +3,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtGraphicalEffects description = Qt Graphical Effects Reference Documentation version = $QT_VERSION +moduleheader = qhp.projects = QtGraphicalEffects diff --git a/src/effects/doc/src/overview-graphicaleffects.qdoc b/src/effects/doc/src/overview-graphicaleffects.qdoc index bb10a7d..40d5c59 100644 --- a/src/effects/doc/src/overview-graphicaleffects.qdoc +++ b/src/effects/doc/src/overview-graphicaleffects.qdoc @@ -34,9 +34,9 @@ components. To import the Qt Graphical Effects types, include the Qt Graphical Effects module by adding the following statement to the QML file: - \code - import QtGraphicalEffects 1.0 - \endcode + \qml \QtMinorVersion + import QtGraphicalEffects 1.\1 + \endqml To use the effects, simply add a specific effect declaration to the QML scene and configure the effects properties. The source item type can be any |