diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-01-25 12:10:33 +0100 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2017-01-27 14:58:39 +0000 |
| commit | f5b66ed6706c129754a8fc0c0541eab1f9ed4181 (patch) | |
| tree | 7cf7903abe9b817c24f34f3074c04e4e0c1f4da1 /examples/qt3d/audio-visualizer-qml | |
| parent | 946e78eada359f651d337309b25d51d4204289b0 (diff) | |
Consolidate QML/C++ materials in extras
We remove the qml implementation of materials in extras that were also
implemented in C++. Note this is an API change for the materials having
texture properties. The QML ones had mistakenly a string property
instead of a texture one. This move also fixes this API issue on the QML
end.
Change-Id: Ibed14288cd7b8c5ab9615b74b949c6a73ac29329
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/audio-visualizer-qml')
| -rw-r--r-- | examples/qt3d/audio-visualizer-qml/Visualizer.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/audio-visualizer-qml/Visualizer.qml b/examples/qt3d/audio-visualizer-qml/Visualizer.qml index 562d8c184..ce32dd3ee 100644 --- a/examples/qt3d/audio-visualizer-qml/Visualizer.qml +++ b/examples/qt3d/audio-visualizer-qml/Visualizer.qml @@ -189,8 +189,8 @@ Entity { NormalDiffuseMapAlphaMaterial { id: titlePlaneMaterial - diffuse: "qrc:/images/demotitle.png" - normal: "qrc:/images/normalmap.png" + diffuse: TextureLoader { source: "qrc:/images/demotitle.png" } + normal: TextureLoader { source: "qrc:/images/normalmap.png" } shininess: 1.0 } @@ -215,8 +215,8 @@ Entity { } property Material songPlaneMaterial: NormalDiffuseMapAlphaMaterial { - diffuse: "qrc:/images/songtitle.png" - normal: "qrc:/images/normalmap.png" + diffuse: TextureLoader { source: "qrc:/images/songtitle.png" } + normal: TextureLoader { source: "qrc:/images/normalmap.png" } shininess: 1.0 } |