diff options
| author | Pasi Keranen <pasi.keranen@digia.com> | 2014-10-23 16:36:08 +0300 |
|---|---|---|
| committer | Pasi Keränen <pasi.keranen@digia.com> | 2014-10-24 08:16:11 +0200 |
| commit | c8db22aee453ca3ecea45e91183a02a61f40335f (patch) | |
| tree | 13619c6c2cf82dc3ed434e8d3c6889f22d81abf0 /src/src.pro | |
| parent | c769a3915f80eff6fafab009a260ddb536a1817c (diff) | |
Reverses QQmlPropertyMap rebase and removed TextureLoader.
QQmlPropertyMap as baseclass doesn't work without additional work, it has been now removed as baseclass from QtCanvas3D for now.
TextureLoader has been removed in favor of TextureImageFactory as that allows easier porting of WebGL based JavaScript code to QtCanvas3D.
Change-Id: I6fb374fd012d7569b9f173b08f4a6f21dcd83abe
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index 1ad3389..5231741 100644 --- a/src/src.pro +++ b/src/src.pro @@ -43,7 +43,6 @@ SOURCES += qcanvas3d_plugin.cpp \ shader3d.cpp \ shaderprecisionformat.cpp \ teximage3d.cpp \ - teximage3dloader.cpp \ texture3d.cpp \ uniformlocation.cpp \ activeinfo3d.cpp @@ -78,7 +77,6 @@ HEADERS += qcanvas3d_plugin.h \ shader3d_p.h \ shaderprecisionformat_p.h \ teximage3d_p.h \ - teximage3dloader_p.h \ texture3d_p.h \ uniformlocation_p.h \ activeinfo3d_p.h |