diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-19 13:10:00 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-19 13:10:28 +0300 |
| commit | 05792cdf5140368a5dcf2e47886e34fd99c56398 (patch) | |
| tree | 14ad1262277c839102eca8a5e2e3a21074425553 | |
| parent | 0c1389258e8c3bdb7ccd2ae55959e4e99a460970 (diff) | |
texture filename & test bug fix
Change-Id: I40a5084de0cf59cee6373d3fcba4bdb9c39a4139
Change-Id: I40a5084de0cf59cee6373d3fcba4bdb9c39a4139
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| -rw-r--r-- | src/datavisualization/data/qcustom3ditem.cpp | 1 | ||||
| -rw-r--r-- | tests/qmlcamera/qml/qmlcamera/main.qml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/datavisualization/data/qcustom3ditem.cpp b/src/datavisualization/data/qcustom3ditem.cpp index 0428d59b..3254ac3b 100644 --- a/src/datavisualization/data/qcustom3ditem.cpp +++ b/src/datavisualization/data/qcustom3ditem.cpp @@ -349,6 +349,7 @@ QImage QCustom3DItemPrivate::textureImage() void QCustom3DItemPrivate::clearTextureImage() { m_textureImage = QImage(); + m_textureFile.clear(); } void QCustom3DItemPrivate::resetDirtyBits() diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml index d32140e7..d2109772 100644 --- a/tests/qmlcamera/qml/qmlcamera/main.qml +++ b/tests/qmlcamera/qml/qmlcamera/main.qml @@ -182,7 +182,7 @@ Rectangle { property bool addObject: false onClicked: { if (addObject === true) { - shuttleItem.textureFile(":/items/shuttle.png") + shuttleItem.textureFile = ":/items/shuttle.png" testChart.addCustomItem(shuttleItem) text = "Remove Shuttle" addObject = false |