diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:33 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:33 +0100 |
| commit | 900749c033705fe58778b238985fa06d7a8fd3aa (patch) | |
| tree | 9fef765dfb27063b81f4bea86898ec3ba8952500 | |
| parent | 7d39bfe3304090ad7808a0886e249c8ecb5e06b2 (diff) | |
| parent | e7ab193d855806d7333577ad7d9d15165d1b5cf8 (diff) | |
| download | qtgraphicaleffects-900749c033705fe58778b238985fa06d7a8fd3aa.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ie477dc9e9d78eb81ba54a44ac7d1621282bf5f28
| -rw-r--r-- | src/effects/doc/src/overview-graphicaleffects.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
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 |