diff options
author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 16:15:20 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-07 09:43:29 +0000 |
commit | e57b18e25f26642deaf224ffd8454ba556e8a1e5 (patch) | |
tree | fa3bed57f98cafd87522f46ee73b078a4dab1957 /src/render/texture/qabstracttextureimage.cpp | |
parent | 544567054ebc9f9fdc3a152581a45697c7a3b5d2 (diff) |
Rename QTextureDataFunctor to QTextureImageDataGenerator
Task-number: QTBUG-51447
Change-Id: I3cb1cd3e2e225288e781c04f274518dde483a69a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/qabstracttextureimage.cpp')
-rw-r--r-- | src/render/texture/qabstracttextureimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp index 3e40789f0..bc3f9fe6f 100644 --- a/src/render/texture/qabstracttextureimage.cpp +++ b/src/render/texture/qabstracttextureimage.cpp @@ -68,7 +68,7 @@ namespace Qt3DRender { QAbstractTextureProvider. It contains the necessary information: mipmap level, layer, cube face load at the proper place data into an OpenGL texture. - The actual data is provided through a QTextureDataFunctor that will be + The actual data is provided through a QTextureImageDataGenerator that will be executed by Aspect jobs in the backend. QAbstractTextureImage should be subclassed to provide a functor and eventual additional properties needed by the functor to load actual data. @@ -196,7 +196,7 @@ void QAbstractTextureImage::update() if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); change->setPropertyName("dataFunctor"); - change->setValue(QVariant::fromValue(dataFunctor())); + change->setValue(QVariant::fromValue(dataGenerator())); d->notifyObservers(change); } } |