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 /src/quick3d/imports/extras/defaults/defaults.pri | |
| 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 'src/quick3d/imports/extras/defaults/defaults.pri')
| -rw-r--r-- | src/quick3d/imports/extras/defaults/defaults.pri | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/quick3d/imports/extras/defaults/defaults.pri b/src/quick3d/imports/extras/defaults/defaults.pri index 98f542fd6..7872837a7 100644 --- a/src/quick3d/imports/extras/defaults/defaults.pri +++ b/src/quick3d/imports/extras/defaults/defaults.pri @@ -8,17 +8,8 @@ QML_FILES = \ $$PWD/qml/DefaultEffect.qml \ $$PWD/qml/DefaultAlphaEffect.qml \ - $$PWD/qml/PhongMaterial.qml \ - $$PWD/qml/DiffuseMapMaterial.qml \ - $$PWD/qml/DiffuseSpecularMapMaterial.qml \ - $$PWD/qml/NormalDiffuseMapMaterial.qml \ - $$PWD/qml/NormalDiffuseMapAlphaMaterial.qml \ - $$PWD/qml/NormalDiffuseSpecularMapMaterial.qml \ $$PWD/qml/ForwardRenderer.qml \ - $$PWD/qml/PerVertexColorMaterial.qml \ $$PWD/qml/SkyboxEntity.qml \ - $$PWD/qml/GoochMaterial.qml \ - $$PWD/qml/PhongAlphaMaterial.qml \ $$PWD/qml/TextureMaterial.qml \ $$PWD/qml/OrbitCameraController.qml \ $$PWD/qml/FirstPersonCameraController.qml \ |