diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-10 13:01:05 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-10 13:01:05 +0300 |
| commit | 293252db84f9ad3b6f6bdb4d467aee88d4ee7f94 (patch) | |
| tree | 3fa3ea8fb304b04abfadd3276992b4945b5504c6 /src/datavisualization/data/qcustom3ditem.cpp | |
| parent | a6e2ddcec415577d535d02dbac172a2499f8288a (diff) | |
| parent | 8a372da705c71c1295a570564c0c7ef4c9698e42 (diff) | |
Merge remote-tracking branch 'origin/develop'
Change-Id: I79e22eacd17dd2108d54c5f623c48117245f9424
Diffstat (limited to 'src/datavisualization/data/qcustom3ditem.cpp')
| -rw-r--r-- | src/datavisualization/data/qcustom3ditem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/datavisualization/data/qcustom3ditem.cpp b/src/datavisualization/data/qcustom3ditem.cpp index f5d8470f..efee3b15 100644 --- a/src/datavisualization/data/qcustom3ditem.cpp +++ b/src/datavisualization/data/qcustom3ditem.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * Holds the texture file name for the item. If left unset, a solid gray texture will be * used. * - * \note To conserve memory the Image loaded from the file is cleared after a texture is created. + * \note To conserve memory the QImage loaded from the file is cleared after a texture is created. */ /*! \qmlproperty vector3d Custom3DItem::position |