From c8db22aee453ca3ecea45e91183a02a61f40335f Mon Sep 17 00:00:00 2001 From: Pasi Keranen Date: Thu, 23 Oct 2014 16:36:08 +0300 Subject: Reverses QQmlPropertyMap rebase and removed TextureLoader. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ää Reviewed-by: Pasi Keränen --- src/src.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/src.pro') 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 -- cgit v1.2.3