diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:02:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:02:22 +0200 |
| commit | bfb7d1a9b026d3735930b31d79d936d5a3d4c79d (patch) | |
| tree | d70fdb16dcb9525c28e0e2c5927c5372b2cc64b3 /src/extras | |
| parent | f2c24adbb3e9561bb2f49f9dfa4daf5d5f315f6a (diff) | |
| parent | 3b71eea2e6e712103452c98756cd6ce53aa4ebca (diff) | |
| download | qtquickcontrols-bfb7d1a9b026d3735930b31d79d936d5a3d4c79d.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia4e23f05ee0dc32d13ad809f4021cd5f0cdff701
Diffstat (limited to 'src/extras')
| -rw-r--r-- | src/extras/qquickpicture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/extras/qquickpicture.cpp b/src/extras/qquickpicture.cpp index 0a778288..73892572 100644 --- a/src/extras/qquickpicture.cpp +++ b/src/extras/qquickpicture.cpp @@ -51,7 +51,7 @@ \since QtQuick.Extras 1.4 \ingroup extras \ingroup extras-non-interactive - \brief An indicator that displays a colorized QPicture icon + \brief An indicator that displays a colorized QPicture icon. Picture displays icons in a scalable vector format. It can also colorize the icons via the \l color property. |