Deprecation readme for qt/quick3d repository.qml2

Conflicts:

	.gitignore
	3rdparty/assimp/README
	3rdparty/assimp/code/3DSConverter.cpp
	3rdparty/assimp/code/3DSHelper.h
	3rdparty/assimp/code/3DSLoader.cpp
	3rdparty/assimp/code/3DSLoader.h
	3rdparty/assimp/code/ACLoader.cpp
	3rdparty/assimp/code/ACLoader.h
	3rdparty/assimp/code/ASELoader.cpp
	3rdparty/assimp/code/ASELoader.h
	3rdparty/assimp/code/ASEParser.cpp
	3rdparty/assimp/code/ASEParser.h
	3rdparty/assimp/code/Assimp.cpp
	3rdparty/assimp/code/AssimpPCH.cpp
	3rdparty/assimp/code/AssimpPCH.h
	3rdparty/assimp/code/B3DImporter.cpp
	3rdparty/assimp/code/B3DImporter.h
	3rdparty/assimp/code/BVHLoader.cpp
	3rdparty/assimp/code/BVHLoader.h
	3rdparty/assimp/code/BaseImporter.cpp
	3rdparty/assimp/code/BaseImporter.h
	3rdparty/assimp/code/BaseProcess.cpp
	3rdparty/assimp/code/BaseProcess.h
	3rdparty/assimp/code/BlenderDNA.cpp
	3rdparty/assimp/code/BlenderDNA.h
	3rdparty/assimp/code/BlenderDNA.inl
	3rdparty/assimp/code/BlenderIntermediate.h
	3rdparty/assimp/code/BlenderLoader.cpp
	3rdparty/assimp/code/BlenderLoader.h
	3rdparty/assimp/code/BlenderModifier.cpp
	3rdparty/assimp/code/BlenderModifier.h
	3rdparty/assimp/code/BlenderScene.cpp
	3rdparty/assimp/code/BlenderScene.h
	3rdparty/assimp/code/BlenderSceneGen.h
	3rdparty/assimp/code/BoostWorkaround/boost/LICENSE_1_0.txt
	3rdparty/assimp/code/BoostWorkaround/boost/foreach.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/format.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/math/common_factor_rt.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/scoped_array.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/scoped_ptr.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/shared_array.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/shared_ptr.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/static_assert.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/timer.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
	3rdparty/assimp/code/ByteSwap.h
	3rdparty/assimp/code/COBLoader.cpp
	3rdparty/assimp/code/COBLoader.h
	3rdparty/assimp/code/COBScene.h
	3rdparty/assimp/code/CSMLoader.cpp
	3rdparty/assimp/code/CSMLoader.h
	3rdparty/assimp/code/ColladaHelper.h
	3rdparty/assimp/code/ColladaLoader.cpp
	3rdparty/assimp/code/ColladaLoader.h
	3rdparty/assimp/code/ColladaParser.cpp
	3rdparty/assimp/code/ComputeUVMappingProcess.cpp
	3rdparty/assimp/code/ComputeUVMappingProcess.h
	3rdparty/assimp/code/ConvertToLHProcess.cpp
	3rdparty/assimp/code/ConvertToLHProcess.h
	3rdparty/assimp/code/DXFLoader.cpp
	3rdparty/assimp/code/DXFLoader.h
	3rdparty/assimp/code/DefaultIOStream.h
	3rdparty/assimp/code/DefaultIOSystem.cpp
	3rdparty/assimp/code/DefaultIOSystem.h
	3rdparty/assimp/code/DefaultLogger.cpp
	3rdparty/assimp/code/DefaultProgressHandler.h
	3rdparty/assimp/code/Exceptional.h
	3rdparty/assimp/code/FileLogStream.h
	3rdparty/assimp/code/FileSystemFilter.h
	3rdparty/assimp/code/FindDegenerates.h
	3rdparty/assimp/code/FindInstancesProcess.cpp
	3rdparty/assimp/code/FindInstancesProcess.h
	3rdparty/assimp/code/FindInvalidDataProcess.cpp
	3rdparty/assimp/code/FindInvalidDataProcess.h
	3rdparty/assimp/code/GenFaceNormalsProcess.cpp
	3rdparty/assimp/code/GenVertexNormalsProcess.cpp
	3rdparty/assimp/code/GenericProperty.h
	3rdparty/assimp/code/HMPFileData.h
	3rdparty/assimp/code/HMPLoader.cpp
	3rdparty/assimp/code/HalfLifeFileData.h
	3rdparty/assimp/code/IFF.h
	3rdparty/assimp/code/IRRLoader.cpp
	3rdparty/assimp/code/IRRLoader.h
	3rdparty/assimp/code/IRRMeshLoader.cpp
	3rdparty/assimp/code/IRRMeshLoader.h
	3rdparty/assimp/code/IRRShared.cpp
	3rdparty/assimp/code/IRRShared.h
	3rdparty/assimp/code/Importer.cpp
	3rdparty/assimp/code/ImproveCacheLocality.cpp
	3rdparty/assimp/code/JoinVerticesProcess.cpp
	3rdparty/assimp/code/LWOAnimation.cpp
	3rdparty/assimp/code/LWOAnimation.h
	3rdparty/assimp/code/LWOBLoader.cpp
	3rdparty/assimp/code/LWOFileData.h
	3rdparty/assimp/code/LWOLoader.cpp
	3rdparty/assimp/code/LWOLoader.h
	3rdparty/assimp/code/LWOMaterial.cpp
	3rdparty/assimp/code/LWSLoader.cpp
	3rdparty/assimp/code/LWSLoader.h
	3rdparty/assimp/code/LimitBoneWeightsProcess.cpp
	3rdparty/assimp/code/LimitBoneWeightsProcess.h
	3rdparty/assimp/code/LineSplitter.h
	3rdparty/assimp/code/MD2FileData.h
	3rdparty/assimp/code/MD2Loader.cpp
	3rdparty/assimp/code/MD2Loader.h
	3rdparty/assimp/code/MD2NormalTable.h
	3rdparty/assimp/code/MD3FileData.h
	3rdparty/assimp/code/MD3Loader.cpp
	3rdparty/assimp/code/MD3Loader.h
	3rdparty/assimp/code/MD4FileData.h
	3rdparty/assimp/code/MD5Loader.cpp
	3rdparty/assimp/code/MD5Loader.h
	3rdparty/assimp/code/MD5Parser.cpp
	3rdparty/assimp/code/MD5Parser.h
	3rdparty/assimp/code/MDCFileData.h
	3rdparty/assimp/code/MDCLoader.cpp
	3rdparty/assimp/code/MDCLoader.h
	3rdparty/assimp/code/MDLFileData.h
	3rdparty/assimp/code/MDLLoader.cpp
	3rdparty/assimp/code/MDLLoader.h
	3rdparty/assimp/code/MS3DLoader.cpp
	3rdparty/assimp/code/MS3DLoader.h
	3rdparty/assimp/code/MakeVerboseFormat.cpp
	3rdparty/assimp/code/MakeVerboseFormat.h
	3rdparty/assimp/code/MaterialSystem.cpp
	3rdparty/assimp/code/MaterialSystem.h
	3rdparty/assimp/code/MemoryIOWrapper.h
	3rdparty/assimp/code/NDOLoader.cpp
	3rdparty/assimp/code/NDOLoader.h
	3rdparty/assimp/code/NFFLoader.cpp
	3rdparty/assimp/code/NFFLoader.h
	3rdparty/assimp/code/OFFLoader.h
	3rdparty/assimp/code/ObjFileData.h
	3rdparty/assimp/code/ObjFileImporter.cpp
	3rdparty/assimp/code/ObjFileImporter.h
	3rdparty/assimp/code/ObjFileMtlImporter.cpp
	3rdparty/assimp/code/ObjFileMtlImporter.h
	3rdparty/assimp/code/ObjFileParser.cpp
	3rdparty/assimp/code/ObjFileParser.h
	3rdparty/assimp/code/ObjTools.h
	3rdparty/assimp/code/OgreImporter.cpp
	3rdparty/assimp/code/OgreImporter.h
	3rdparty/assimp/code/OgreImporterMaterial.cpp
	3rdparty/assimp/code/OptimizeGraph.cpp
	3rdparty/assimp/code/OptimizeGraph.h
	3rdparty/assimp/code/OptimizeMeshes.h
	3rdparty/assimp/code/PlyLoader.cpp
	3rdparty/assimp/code/PlyLoader.h
	3rdparty/assimp/code/PlyParser.h
	3rdparty/assimp/code/PretransformVertices.cpp
	3rdparty/assimp/code/PretransformVertices.h
	3rdparty/assimp/code/ProcessHelper.h
	3rdparty/assimp/code/Q3BSPFileData.h
	3rdparty/assimp/code/Q3BSPFileImporter.cpp
	3rdparty/assimp/code/Q3BSPFileImporter.h
	3rdparty/assimp/code/Q3BSPZipArchive.cpp
	3rdparty/assimp/code/Q3BSPZipArchive.h
	3rdparty/assimp/code/Q3DLoader.cpp
	3rdparty/assimp/code/Q3DLoader.h
	3rdparty/assimp/code/RawLoader.cpp
	3rdparty/assimp/code/RawLoader.h
	3rdparty/assimp/code/RemoveComments.cpp
	3rdparty/assimp/code/RemoveComments.h
	3rdparty/assimp/code/RemoveRedundantMaterials.cpp
	3rdparty/assimp/code/RemoveRedundantMaterials.h
	3rdparty/assimp/code/RemoveVCProcess.cpp
	3rdparty/assimp/code/RemoveVCProcess.h
	3rdparty/assimp/code/SGSpatialSort.h
	3rdparty/assimp/code/SMDLoader.cpp
	3rdparty/assimp/code/SMDLoader.h
	3rdparty/assimp/code/STLLoader.cpp
	3rdparty/assimp/code/STLLoader.h
	3rdparty/assimp/code/SceneCombiner.cpp
	3rdparty/assimp/code/SceneCombiner.h
	3rdparty/assimp/code/ScenePreprocessor.cpp
	3rdparty/assimp/code/ScenePreprocessor.h
	3rdparty/assimp/code/SkeletonMeshBuilder.h
	3rdparty/assimp/code/SortByPTypeProcess.cpp
	3rdparty/assimp/code/SortByPTypeProcess.h
	3rdparty/assimp/code/SpatialSort.cpp
	3rdparty/assimp/code/SpatialSort.h
	3rdparty/assimp/code/SplitLargeMeshes.cpp
	3rdparty/assimp/code/SplitLargeMeshes.h
	3rdparty/assimp/code/StandardShapes.cpp
	3rdparty/assimp/code/StandardShapes.h
	3rdparty/assimp/code/StdOStreamLogStream.h
	3rdparty/assimp/code/StreamReader.h
	3rdparty/assimp/code/StringComparison.h
	3rdparty/assimp/code/Subdivision.cpp
	3rdparty/assimp/code/Subdivision.h
	3rdparty/assimp/code/TargetAnimation.cpp
	3rdparty/assimp/code/TargetAnimation.h
	3rdparty/assimp/code/TerragenLoader.cpp
	3rdparty/assimp/code/TerragenLoader.h
	3rdparty/assimp/code/TextureTransform.cpp
	3rdparty/assimp/code/TextureTransform.h
	3rdparty/assimp/code/TinyFormatter.h
	3rdparty/assimp/code/TriangulateProcess.cpp
	3rdparty/assimp/code/UnrealLoader.cpp
	3rdparty/assimp/code/UnrealLoader.h
	3rdparty/assimp/code/ValidateDataStructure.cpp
	3rdparty/assimp/code/ValidateDataStructure.h
	3rdparty/assimp/code/Vertex.h
	3rdparty/assimp/code/VertexTriangleAdjacency.cpp
	3rdparty/assimp/code/VertexTriangleAdjacency.h
	3rdparty/assimp/code/Win32DebugLogStream.h
	3rdparty/assimp/code/XFileImporter.h
	3rdparty/assimp/code/XFileParser.cpp
	3rdparty/assimp/code/aiAssert.cpp
	3rdparty/assimp/code/assbin_chunks.h
	3rdparty/assimp/code/fast_atof.h
	3rdparty/assimp/code/irrXMLWrapper.h
	3rdparty/assimp/code/res/resource.h
	3rdparty/assimp/contrib/ConvertUTF/ConvertUTF.c
	3rdparty/assimp/contrib/ConvertUTF/ConvertUTF.h
	3rdparty/assimp/contrib/irrXML/heapsort.h
	3rdparty/assimp/contrib/irrXML/irrArray.h
	3rdparty/assimp/contrib/irrXML/irrString.h
	3rdparty/assimp/contrib/irrXML/irrTypes.h
	3rdparty/assimp/contrib/unzip/crypt.h
	3rdparty/assimp/contrib/unzip/ioapi.c
	3rdparty/assimp/contrib/unzip/unzip.h
	3rdparty/assimp/include/Compiler/poppack1.h
	3rdparty/assimp/include/Compiler/pushpack1.h
	3rdparty/assimp/include/DefaultLogger.h
	3rdparty/assimp/include/IOStream.h
	3rdparty/assimp/include/IOSystem.h
	3rdparty/assimp/include/LogStream.h
	3rdparty/assimp/include/Logger.h
	3rdparty/assimp/include/NullLogger.h
	3rdparty/assimp/include/ProgressHandler.h
	3rdparty/assimp/include/aiAnim.h
	3rdparty/assimp/include/aiAssert.h
	3rdparty/assimp/include/aiCamera.h
	3rdparty/assimp/include/aiColor4D.inl
	3rdparty/assimp/include/aiConfig.h
	3rdparty/assimp/include/aiLight.h
	3rdparty/assimp/include/aiMaterial.h
	3rdparty/assimp/include/aiMaterial.inl
	3rdparty/assimp/include/aiMatrix3x3.h
	3rdparty/assimp/include/aiMatrix3x3.inl
	3rdparty/assimp/include/aiMatrix4x4.h
	3rdparty/assimp/include/aiMatrix4x4.inl
	3rdparty/assimp/include/aiMesh.h
	3rdparty/assimp/include/aiPostProcess.h
	3rdparty/assimp/include/aiScene.h
	3rdparty/assimp/include/aiTexture.h
	3rdparty/assimp/include/aiTypes.h
	3rdparty/assimp/include/aiVector2D.h
	3rdparty/assimp/include/aiVector3D.inl
	3rdparty/assimp/include/assimp.hpp
	3rdparty/assimp/revision.h
	README
	debian/changelog
	debian/control
	debian/libqt4-3d-examples.install
	debian/rules
	demos/qt3d/cubehouse/cubehouse.desktop
	demos/qt3d/cubehouse/cubehouse.pro
	demos/qt3d/cubehouse/cubeview.cpp
	demos/qt3d/cubehouse/cubeview.h
	demos/qt3d/cubehouse/main.cpp
	demos/qt3d/cubehouse/qt3d.ico
	demos/qt3d/cubehouse/shaders/depth.frag
	demos/qt3d/cubehouse/shaders/depth.vert
	demos/qt3d/cubehouse/shaders/depthTestShader.frag
	demos/qt3d/cubehouse/shaders/depthTestShader.vert
	demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
	demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
	demos/qt3d/pageflip/pageflip.cpp
	demos/qt3d/pageflip/pageflip.desktop
	demos/qt3d/pageflip/pageflip.pro
	demos/qt3d/pageflip/qt3d.ico
	demos/qt3d/photobrowser3d/bytereader.cpp
	demos/qt3d/photobrowser3d/filescanner.cpp
	demos/qt3d/photobrowser3d/imageloader.cpp
	demos/qt3d/photobrowser3d/main.cpp
	demos/qt3d/photobrowser3d/photobrowser3d.desktop
	demos/qt3d/photobrowser3d/photobrowser3d.pro
	demos/qt3d/photobrowser3d/qatlas.cpp
	demos/qt3d/photobrowser3d/qatlas.h
	demos/qt3d/photobrowser3d/qfocusadaptor.cpp
	demos/qt3d/photobrowser3d/qt3d.ico
	demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
	demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
	demos/qt3d/photobrowser3d/threadpool.cpp
	demos/qt3d/photobrowser3d/thumbnailableimage.cpp
	demos/qt3d/photobrowser3d/thumbnailnode.cpp
	demos/qt3d/qt3d.svg
	demos/qt3d/shapes/qt3d.ico
	demos/qt3d/shapes/shapes.cpp
	demos/qt3d/shapes/shapes.desktop
	demos/qt3d/shapes/shapes.pro
	demos/qt3d/teaservice/qt3d.ico
	demos/qt3d/teaservice/teaservice.cpp
	demos/qt3d/teaservice/teaservice.desktop
	demos/qt3d/teaservice/teaservice.pro
	demos/quick3d/flickr3d/flickr3d.pro
	demos/quick3d/flickr3d/flickr3d.rc
	demos/quick3d/flickr3d/main.cpp
	demos/quick3d/icon.png
	demos/quick3d/model_viewer/main.cpp
	demos/quick3d/model_viewer/model_viewer.desktop
	demos/quick3d/model_viewer/model_viewer.pro
	demos/quick3d/model_viewer/qml/FourButtons.qml
	demos/quick3d/model_viewer/qml/LongButton.qml
	demos/quick3d/model_viewer/qml/MainButton.qml
	demos/quick3d/model_viewer/qml/ModelViewer.qml
	demos/quick3d/model_viewer/qml/ShortButton.qml
	demos/quick3d/model_viewer/qtquick3d.ico
	demos/quick3d/qmlres.h
	demos/quick3d/qtquick3d.svg
	demos/quick3d/robo_bounce/main.cpp
	demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml
	demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml
	demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml
	demos/quick3d/robo_bounce/qml/RoboBounce.qml
	demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
	demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
	demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
	demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
	demos/quick3d/robo_bounce/qtquick3d.ico
	demos/quick3d/robo_bounce/robo_bounce.desktop
	demos/quick3d/robo_bounce/robo_bounce.pro
	demos/quick3d/robo_bounce/robo_bounce.qrc
	demos/quick3d/tea_service/main.cpp
	demos/quick3d/tea_service/qml/TeaService.qml
	demos/quick3d/tea_service/qml/Teacup.qml
	demos/quick3d/tea_service/qml/Teaspoon.qml
	demos/quick3d/tea_service/qtquick3d.ico
	demos/quick3d/tea_service/tea_service.desktop
	demos/quick3d/tea_service/tea_service.pro
	doc/config/qt-cpp-ignore.qdocconf
	doc/src/index.qdoc
	doc/src/qt3d-building.qdoc
	doc/src/qt3d-contrib.qdoc
	examples/qt3d/basket/basket.desktop
	examples/qt3d/basket/basket.pro
	examples/qt3d/basket/basketview.cpp
	examples/qt3d/basket/basketview.h
	examples/qt3d/basket/main.cpp
	examples/qt3d/basket/qt3d.ico
	examples/qt3d/builder/builder.cpp
	examples/qt3d/builder/builder.desktop
	examples/qt3d/builder/builder.h
	examples/qt3d/builder/builder.pro
	examples/qt3d/builder/main.cpp
	examples/qt3d/builder/qt3d.ico
	examples/qt3d/cube/cube.desktop
	examples/qt3d/cube/cube.pro
	examples/qt3d/cube/cubeview.cpp
	examples/qt3d/cube/cubeview.h
	examples/qt3d/cube/main.cpp
	examples/qt3d/cube/qt3d.ico
	examples/qt3d/cylinder/cylinder.desktop
	examples/qt3d/cylinder/cylinder.pro
	examples/qt3d/cylinder/cylinderview.cpp
	examples/qt3d/cylinder/cylinderview.h
	examples/qt3d/cylinder/main.cpp
	examples/qt3d/cylinder/qt3d.ico
	examples/qt3d/geometry/geometry.cpp
	examples/qt3d/geometry/geometry.desktop
	examples/qt3d/geometry/geometry.pro
	examples/qt3d/geometry/geometryview.cpp
	examples/qt3d/geometry/geometryview.h
	examples/qt3d/geometry/main.cpp
	examples/qt3d/geometry/qt3d.ico
	examples/qt3d/nesting/cubeview.cpp
	examples/qt3d/nesting/cubeview.h
	examples/qt3d/nesting/main.cpp
	examples/qt3d/nesting/nesting.desktop
	examples/qt3d/nesting/nesting.pro
	examples/qt3d/nesting/qt3d.ico
	examples/qt3d/qt3d.pro
	examples/qt3d/qt3d.svg
	examples/qt3d/solarsystem/main.cpp
	examples/qt3d/solarsystem/qt3d.ico
	examples/qt3d/solarsystem/solarsystem.cpp
	examples/qt3d/solarsystem/solarsystem.desktop
	examples/qt3d/solarsystem/solarsystem.h
	examples/qt3d/solarsystem/solarsystem.pro
	examples/qt3d/tank/main.cpp
	examples/qt3d/tank/qt3d.ico
	examples/qt3d/tank/tank.desktop
	examples/qt3d/tank/tank.pro
	examples/qt3d/tank/tankview.cpp
	examples/qt3d/tank/tankview.h
	examples/qt3d/teapot/main.cpp
	examples/qt3d/teapot/qt3d.ico
	examples/qt3d/teapot/teapot.desktop
	examples/qt3d/teapot/teapot.pro
	examples/qt3d/teapot/teapotview.h
	examples/quick3d/basket/basket.pro
	examples/quick3d/basket/basket.qrc
	examples/quick3d/basket/basket_qml.desktop
	examples/quick3d/basket/main.cpp
	examples/quick3d/basket/qml/Basket.qml
	examples/quick3d/basket/qtquick3d.ico
	examples/quick3d/cube/cube.pro
	examples/quick3d/cube/main.cpp
	examples/quick3d/cube/qml/Cube.qml
	examples/quick3d/cube/qtquick3d.ico
	examples/quick3d/forest/forest.pro
	examples/quick3d/forest/forest.qrc
	examples/quick3d/forest/main.cpp
	examples/quick3d/forest/qml/Forest.qml
	examples/quick3d/forest/qml/Tree.qml
	examples/quick3d/forest/qtquick3d.ico
	examples/quick3d/lander/lander.desktop
	examples/quick3d/lander/lander.pro
	examples/quick3d/lander/main.cpp
	examples/quick3d/lander/qml/Lander.qml
	examples/quick3d/lander/qtquick3d.ico
	examples/quick3d/matrix_animation/main.cpp
	examples/quick3d/matrix_animation/matrix_animation.desktop
	examples/quick3d/matrix_animation/matrix_animation.pro
	examples/quick3d/matrix_animation/qml/MatrixAnimation.qml
	examples/quick3d/matrix_animation/qtquick3d.ico
	examples/quick3d/monkeygod/main.cpp
	examples/quick3d/monkeygod/monkeygod.desktop
	examples/quick3d/monkeygod/monkeygod.pro
	examples/quick3d/monkeygod/qml/Monkeygod.qml
	examples/quick3d/monkeygod/qml/Penguin.qml
	examples/quick3d/monkeygod/qml/desktop.qml
	examples/quick3d/monkeygod/qtquick3d.ico
	examples/quick3d/moon/main.cpp
	examples/quick3d/moon/moon.desktop
	examples/quick3d/moon/moon.pro
	examples/quick3d/moon/qml/Moon.qml
	examples/quick3d/moon/qml/desktop.qml
	examples/quick3d/moon/qtquick3d.ico
	examples/quick3d/photoroom/main.cpp
	examples/quick3d/photoroom/mt.qml
	examples/quick3d/photoroom/photoroom.desktop
	examples/quick3d/photoroom/photoroom.pro
	examples/quick3d/photoroom/qml/PhotoPane.qml
	examples/quick3d/photoroom/qml/PhotoRoom.qml
	examples/quick3d/photoroom/qml/textures/background.jpg
	examples/quick3d/photoroom/qml/textures/basket.jpg
	examples/quick3d/photoroom/qml/textures/niagara_falls.jpg
	examples/quick3d/photoroom/qtquick3d.ico
	examples/quick3d/qmlres.h
	examples/quick3d/qtquick3d.svg
	examples/quick3d/quick3d.pro
	examples/quick3d/shaders/main.cpp
	examples/quick3d/shaders/qml/Bouncing.qml
	examples/quick3d/shaders/qml/Collapsing.qml
	examples/quick3d/shaders/qml/Images.qml
	examples/quick3d/shaders/qml/Interpolate.qml
	examples/quick3d/shaders/qml/Shaders.qml
	examples/quick3d/shaders/qtquick3d.ico
	examples/quick3d/shaders/shaders.desktop
	examples/quick3d/shaders/shaders.pro
	examples/quick3d/sphere/main.cpp
	examples/quick3d/sphere/qml/Sphere.qml
	examples/quick3d/sphere/qtquick3d.ico
	examples/quick3d/sphere/sphere.desktop
	examples/quick3d/sphere/sphere.pro
	features/qt3d.prf
	features/qt3dquick.prf
	pkg.pri
	qtc_packaging/debian_harmattan/README
	qtc_packaging/debian_harmattan/changelog
	qtc_packaging/debian_harmattan/control
	qtc_packaging/debian_harmattan/libqt4-3d-examples.install
	qtc_packaging/debian_harmattan/rules
	qtquick3d.pro
	src/imports/shapes/cube.obj
	src/imports/shapes/cube.qdoc
	src/imports/shapes/line.cpp
	src/imports/shapes/point.cpp
	src/imports/shapes/quad.obj
	src/imports/shapes/quad.qdoc
	src/imports/shapes/shapes.pro
	src/imports/shapes/spheremesh.h
	src/imports/shapes/teapot.qdoc
	src/imports/threed/qgraphicslookattransform.cpp
	src/imports/threed/shaderprogram.cpp
	src/imports/threed/shaderprogram.h
	src/imports/threed/skybox.cpp
	src/imports/threed/skybox.h
	src/imports/threed/threed.cpp
	src/imports/threed/threed.pro
	src/imports/threed/viewport.cpp
	src/imports/threed/viewport.h
	src/plugins/imageformats/tga/main.cpp
	src/plugins/imageformats/tga/qtgahandler.cpp
	src/plugins/imageformats/tga/qtgahandler.h
	src/plugins/plugins.pro
	src/plugins/qpluginbase.pri
	src/plugins/sceneformats/3ds/3ds.pro
	src/plugins/sceneformats/3ds/qgl3dsscenehandler.cpp
	src/plugins/sceneformats/3ds/qgl3dsscenehandler.h
	src/plugins/sceneformats/assimp/ailoaderiosystem.cpp
	src/plugins/sceneformats/assimp/assimp.pro
	src/plugins/sceneformats/assimp/qailoader.cpp
	src/plugins/sceneformats/assimp/qailoader.h
	src/plugins/sceneformats/assimp/qaimesh.h
	src/plugins/sceneformats/assimp/qaiscene.cpp
	src/plugins/sceneformats/assimp/qaiscene.h
	src/plugins/sceneformats/assimp/qaiscenehandler.cpp
	src/plugins/sceneformats/assimp/qaiscenehandler.h
	src/plugins/sceneformats/bezier/bezier.pro
	src/plugins/sceneformats/bezier/main.cpp
	src/plugins/sceneformats/bezier/qglbezierscenehandler.cpp
	src/plugins/sceneformats/bezier/qglbezierscenehandler.h
	src/plugins/sceneformats/obj/obj.pro
	src/plugins/sceneformats/obj/qglobjscenehandler.cpp
	src/plugins/sceneformats/obj/qglobjscenehandler.h
	src/private/private.pri
	src/private/qfactoryloader_p.h
	src/quick3d/qdeclarativeeffect.cpp
	src/quick3d/qdeclarativeitem3d.cpp
	src/quick3d/qdeclarativeitem3d.h
	src/quick3d/qdeclarativemesh.cpp
	src/quick3d/qt3dquickglobal.h
	src/quick3d/quick3d.pri
	src/quick3d/quick3d.pro
	src/scripts/build_src_package.sh
	src/scripts/build_win_package.bat
	src/scripts/build_win_package.nsi
	src/scripts/filter-qmldump.pl
	src/threed/api/api.pri
	src/threed/api/gl-gen-funcs.pl
	src/threed/arrays/qarray.h
	src/threed/arrays/qglindexbuffer.cpp
	src/threed/arrays/qglvertexbundle_p.h
	src/threed/effects/qglcolladafxeffectfactory.cpp
	src/threed/effects/qglshaderprogrameffect.cpp
	src/threed/geometry/qgeometrydata.cpp
	src/threed/geometry/qglbezierpatches.cpp
	src/threed/geometry/qglcube.cpp
	src/threed/geometry/qglcylinder.cpp
	src/threed/geometry/qgldome.cpp
	src/threed/global/qt3dglobal.h
	src/threed/graphicsview/qglgraphicsviewportitem.cpp
	src/threed/graphicsview/qglgraphicsviewportitem.h
	src/threed/graphicsview/qgraphicsembedscene.cpp
	src/threed/graphicsview/qgraphicsembedscene.h
	src/threed/graphicsview/qgraphicsrotation3d.cpp
	src/threed/materials/qglmaterial.cpp
	src/threed/painting/qglext.cpp
	src/threed/painting/qglext_p.h
	src/threed/painting/qglpainter.cpp
	src/threed/painting/qglpainter.h
	src/threed/painting/qglpainter_p.h
	src/threed/scene/qglabstractscene.cpp
	src/threed/scene/qglabstractscene.h
	src/threed/scene/qglrenderstate.cpp
	src/threed/scene/qglsceneformatplugin.cpp
	src/threed/scene/qglsceneformatplugin.h
	src/threed/scene/qglscenenode.cpp
	src/threed/scene/qglscenenode.h
	src/threed/surfaces/qglabstractsurface.cpp
	src/threed/surfaces/qglabstractsurface.h
	src/threed/surfaces/qglcontextsurface.cpp
	src/threed/surfaces/qglcontextsurface_p.h
	src/threed/surfaces/qgldrawbuffersurface.cpp
	src/threed/surfaces/qgldrawbuffersurface_p.h
	src/threed/surfaces/qglframebufferobjectsurface.cpp
	src/threed/surfaces/qglframebufferobjectsurface.h
	src/threed/surfaces/qglmaskedsurface.cpp
	src/threed/surfaces/qglmaskedsurface_p.h
	src/threed/surfaces/qglpaintersurface.cpp
	src/threed/surfaces/qglpaintersurface_p.h
	src/threed/surfaces/qglpixelbuffersurface.cpp
	src/threed/surfaces/qglpixelbuffersurface.h
	src/threed/surfaces/qglsubsurface.cpp
	src/threed/surfaces/qglsubsurface.h
	src/threed/surfaces/qglwindowsurface.h
	src/threed/surfaces/surfaces.pri
	src/threed/textures/qglsharedresource.cpp
	src/threed/textures/qgltexture2d.cpp
	src/threed/textures/qgltexture2d.h
	src/threed/textures/qgltexture2d_p.h
	src/threed/textures/qgltextureutils.cpp
	src/threed/textures/qgltextureutils_p.h
	src/threed/threed.pri
	src/threed/threed.pro
	src/threed/viewing/qglcamera.cpp
	src/threed/viewing/qglcamera.h
	src/threed/viewing/qglview.cpp
	src/threed/viewing/qglview.h
	tests/auto/auto.pro
	tests/auto/qml3d/QtQuickTest/TestCase.qml
	tests/auto/qml3d/effect/tst_effect.qml
	tests/auto/qml3d/item3d/tst_item3d.qml
	tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml
	tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml
	tests/auto/qml3d/lookat/tst_lookat.qml
	tests/auto/qml3d/mesh/tst_mesh.qml
	tests/auto/qml3d/modelview/tst_modelview.qml
	tests/auto/qml3d/picking/tst_picking.qml
	tests/auto/qml3d/qml3d.pro
	tests/auto/qml3d/scale3d/tst_scale3d.qml
	tests/auto/qml3d/sphere/tst_sphere.qml
	tests/auto/qml3d/tst_qml3d.cpp
	tests/auto/qml3d/viewport/tst_viewport.qml
	tests/auto/threed/load_model/load_model.pro
	tests/auto/threed/load_model/tst_load_model.cpp
	tests/auto/threed/qareaallocator/qareaallocator.pro
	tests/auto/threed/qarray/qarray.pro
	tests/auto/threed/qbox3d/qbox3d.pro
	tests/auto/threed/qcolor4ub/qcolor4ub.pro
	tests/auto/threed/qcustomdataarray/qcustomdataarray.pro
	tests/auto/threed/qgeometrydata/qgeometrydata.pro
	tests/auto/threed/qgeometrydata/tst_qgeometrydata.cpp
	tests/auto/threed/qglabstractsurface/qglabstractsurface.pro
	tests/auto/threed/qglabstractsurface/tst_qglabstractsurface.cpp
	tests/auto/threed/qglattributedescription/qglattributedescription.pro
	tests/auto/threed/qglattributeset/qglattributeset.pro
	tests/auto/threed/qglattributeset/tst_qglattributeset.cpp
	tests/auto/threed/qglattributevalue/qglattributevalue.pro
	tests/auto/threed/qglbezierpatches/qglbezierpatches.pro
	tests/auto/threed/qglbuilder/qglbuilder.pro
	tests/auto/threed/qglcamera/qglcamera.pro
	tests/auto/threed/qglcameraanimation/qglcameraanimation.pro
	tests/auto/threed/qglcameraanimation/tst_qglcameraanimation.cpp
	tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
	tests/auto/threed/qglcube/qglcube.pro
	tests/auto/threed/qglcube/tst_qglcube.cpp
	tests/auto/threed/qglcylinder/qglcylinder.pro
	tests/auto/threed/qglindexbuffer/qglindexbuffer.pro
	tests/auto/threed/qglindexbuffer/tst_qglindexbuffer.cpp
	tests/auto/threed/qgllightmodel/qgllightmodel.pro
	tests/auto/threed/qgllightparameters/qgllightparameters.pro
	tests/auto/threed/qglmaterial/qglmaterial.pro
	tests/auto/threed/qglmaterial/tst_qglmaterial.cpp
	tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro
	tests/auto/threed/qglpainter/qglpainter.pro
	tests/auto/threed/qglpainter/qgltestwidget.cpp
	tests/auto/threed/qglpainter/qgltestwidget.h
	tests/auto/threed/qglpainter/tst_qglpainter.cpp
	tests/auto/threed/qglpickcolors/qglpickcolors.pro
	tests/auto/threed/qglrender/qglrender.pro
	tests/auto/threed/qglrender/tst_qglrender.cpp
	tests/auto/threed/qglscenenode/qglscenenode.pro
	tests/auto/threed/qglscenenode/tst_qglscenenode.cpp
	tests/auto/threed/qglsection/qglsection.pro
	tests/auto/threed/qglsharedresource/qglsharedresource.pro
	tests/auto/threed/qglsharedresource/tst_qglsharedresource.cpp
	tests/auto/threed/qglsphere/qglsphere.pro
	tests/auto/threed/qglvertexbundle/qglvertexbundle.pro
	tests/auto/threed/qglvertexbundle/tst_qglvertexbundle.cpp
	tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro
	tests/auto/threed/qplane3d/qplane3d.pro
	tests/auto/threed/qray3d/qray3d.pro
	tests/auto/threed/qsphere3d/qsphere3d.pro
	tests/auto/threed/qstereoimage/qstereoimage.pro
	tests/auto/threed/qtriangle3d/qtriangle3d.pro
	tests/auto/threed/qvectorarray/qvectorarray.pro
	tests/auto/threed/threed.pro
	tests/benchmarks/matrix_properties/matrix_properties.pro
	tests/benchmarks/matrix_properties/tst_matrix_properties.cpp
	tests/benchmarks/qarray/qarray.pro
	tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro
	tests/manual/animations/animations.pro
	tests/manual/animations/main.cpp
	tests/manual/animations/qml/TestCase.qml
	tests/manual/animations/qml/tst_animations.qml
	tests/manual/animations/tst_animations_qml.desktop
	tests/manual/background/main.cpp
	tests/manual/basic/basic.pro
	tests/manual/basic/main.cpp
	tests/manual/displaymodel/displaymodel.pro
	tests/manual/displaymodel/main.cpp
	tests/manual/displaymodel/qml/tst_displaymodel.qml
	tests/manual/fullreferencing/main.cpp
	tests/manual/manual.pro
	tests/manual/model3ds/main.cpp
	tests/manual/model3ds/model3ds.pro
	tests/manual/model3ds/qml/tst_model3ds.qml
	tests/manual/model3ds/tst_submesh_qml.desktop
	tests/manual/navigation1/main.cpp
	tests/manual/navigation1/navigation1.pro
	tests/manual/navigation1/qml/tst_navigation1.qml
	tests/manual/qrc/main.cpp
	tests/manual/qrc/qrc.pro
	tests/manual/qrc/tst_qrc_qml.desktop
	tests/manual/rotation/main.cpp
	tests/manual/rotation/qml/TestCase.qml
	tests/manual/rotation/qml/tst_rotation.qml
	tests/manual/rotation/rotation.pro
	tests/manual/rotation/tst_rotation_qml.desktop
	tests/manual/scaling/main.cpp
	tests/manual/scaling/qml/ScalingTestCase.qml
	tests/manual/scaling/qml/tst_scaling.qml
	tests/manual/scaling/scaling.pro
	tests/manual/scaling/tst_scaling_qml.desktop
	tests/manual/shapes/main.cpp
	tests/manual/shapes/shapes.pro
	tests/manual/submesh/main.cpp
	tests/manual/submesh/qml/tst_submesh.qml
	tests/manual/submesh/submesh.pro
	tests/manual/submesh/tst_submesh_qml.desktop
	tests/manual/transformations/main.cpp
	tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml
	tests/manual/transformations/qml/TransformationListTestCase.qml
	tests/manual/transformations/qml/tst_transformations.qml
	tests/manual/transformations/transformations.pro
	tests/manual/transformations/tst_transformations_qml.desktop
	tests/manual/translation/main.cpp
	tests/manual/translation/qml/AxesVsVectorTestCase.qml
	tests/manual/translation/qml/TranslationTestCase.qml
	tests/manual/translation/qml/TranslationVectorTestCase.qml
	tests/manual/translation/qml/tst_translation.qml
	tests/manual/translation/translation.pro
	tests/manual/translation/tst_translation_qml.desktop
	tests/shared/qmlres.h
	tests/shared/qtest_helpers.h
	tests/tests.pro
	tutorials/qt3d/cube1/cube1.pro
	tutorials/qt3d/cube1/cubeview.cpp
	tutorials/qt3d/cube1/cubeview.h
	tutorials/qt3d/cube1/main.cpp
	tutorials/qt3d/cube2/cube2.pro
	tutorials/qt3d/cube2/cubeview.cpp
	tutorials/qt3d/cube2/cubeview.h
	tutorials/qt3d/cube2/main.cpp
	tutorials/qt3d/cube3/cube3.pro
	tutorials/qt3d/cube3/cubeview.cpp
	tutorials/qt3d/cube3/cubeview.h
	tutorials/qt3d/cube3/main.cpp
	tutorials/qt3d/cube4/cube4.pro
	tutorials/qt3d/cube4/cubeview.cpp
	tutorials/qt3d/cube4/cubeview.h
	tutorials/qt3d/cube4/main.cpp
	tutorials/qt3d/penguin/main.cpp
	tutorials/qt3d/penguin/modelview.h
	tutorials/qt3d/penguin/penguin.pro
	tutorials/qt3d/penguin_advanced/main.cpp
	tutorials/qt3d/penguin_advanced/modelview.cpp
	tutorials/qt3d/penguin_advanced/modelview.h
	tutorials/qt3d/penguin_advanced/penguin_advanced.pro
	tutorials/quick3d/qmlres.h
	tutorials/quick3d/teapot_bounce_qml/main.cpp
	tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop
	tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
	tutorials/quick3d/teapot_qml/main.cpp
	tutorials/quick3d/teapot_qml/teapot_qml.desktop
	tutorials/quick3d/teapot_qml/teapot_qml.pro
	util/meshcvt/meshcvt.pro
	util/qt3d/qglinfo/qglinfo.pro
	util/qt3d/qglinfo/qglinfowindow.cpp
	util/qt3d/qt3d.pro

Change-Id: I0983a5d634c16d9243210275091eff2227a4c2ec
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

1 files changed, 0 insertions, 479 deletions

diff --git a/src/quick3d/qdeclarativeeffect.cpp b/src/quick3d/qdeclarativeeffect.cpp
deleted file mode 100644
index 2fe10ed1..00000000
--- a/src/quick3d/qdeclarativeeffect.cpp
+++ /dev/null
@@ -1,479 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativeeffect.h"
-
-#include "qglpainter.h"
-#include "qglmaterial.h"
-
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
-
-#include <QtDeclarative/qdeclarativeengine.h>
-
-#include <QtDeclarative/qdeclarativeinfo.h>
-#include "qglscenenode.h"
-
-/*!
-    \qmlclass Effect QDeclarativeEffect
-    \brief The Effect item defines simple effects within the QML/3D environment.  Examples
-    of such effects include textures, simple material and lighting effects, and so on.
-    \since 4.8
-    \ingroup qt3d::qml3d
-
-    \section1 Defining an Effect
-
-    Effects can be defined within QML using the normal syntax for creating any QML/3d object.  To create a
-    default effect with no extra information, for example, we can simply using the following:
-
-    \code
-    Effect {}
-    \endcode
-
-    More complex effects use the usual QML syntax for accessing and updating properties.  In order to specify
-    a texture, for example, the following could be used:
-
-    \code
-    Effect {
-        id: myTextureEffect
-        texture: "texture.png"
-    }
-    \endcode
-*/
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeEffectPrivate
-{
-public:
-    QDeclarativeEffectPrivate()
-        : color(255, 255, 255, 255),
-          useLighting(true),
-          decal(false),
-          blending(false),
-          palette(0),
-          materialIndex(-1),
-          progress(0.0)
-    {
-    }
-
-    ~QDeclarativeEffectPrivate()
-    {
-        delete palette;
-    }
-
-    QColor color;
-    bool useLighting;
-    bool decal;
-    bool blending;
-    QGLMaterialCollection *palette;
-    int materialIndex;
-    qreal progress;
-    inline void ensureMaterial() {
-        if (!palette)
-        {
-            palette = new QGLMaterialCollection();
-        }
-        if (materialIndex == -1)
-        {
-            materialIndex = palette->addMaterial(new QGLMaterial(palette));
-            palette->material(materialIndex)->setColor(color);
-        }
-        // TODO: decal & blending
-    }
-};
-
-/*!
-    \internal
-    Constructs the Effect object with \a parent as its parent.
-*/
-QDeclarativeEffect::QDeclarativeEffect(QObject *parent)
-    : QObject(parent)
-{
-    d = new QDeclarativeEffectPrivate;
-}
-
-/*!
-    \internal
-    Destroy the \l Effect object and delete any unneeded data.
-*/
-QDeclarativeEffect::~QDeclarativeEffect()
-{
-    delete d;
-}
-
-/*!
-    \qmlproperty color Effect::color
-
-    The color of the object for simple non-texture effects.
-    The default value for this property is white.
-*/
-
-QColor QDeclarativeEffect::color() const
-{
-    return d->color;
-}
-
-void QDeclarativeEffect::setColor(const QColor& value)
-{
-    d->color = value;
-    d->ensureMaterial();
-    material()->setColor(value);
-    emit effectChanged();
-}
-
-/*!
-    \qmlproperty bool Effect::useLighting
-
-    The lighting control parameter; true if this effect should
-    use lighting or false if this effect should use flat colors and
-    textures.
-
-    The default value for this property is true.
-*/
-bool QDeclarativeEffect::useLighting() const
-{
-    return d->useLighting;
-}
-
-void QDeclarativeEffect::setUseLighting(bool value)
-{
-    d->useLighting = value;
-    emit effectChanged();
-}
-
-/*!
-    \qmlproperty bool Effect::decal
-
-    This property should be set to true if the \l texture should be
-    combined with \l color to decal the texture onto the object.
-    This property should be set to false to use the texture
-    directly, combined with the \l material parameters.
-
-    The default value for this property is false.
-*/
-bool QDeclarativeEffect::decal() const
-{
-    return d->decal;
-}
-
-void QDeclarativeEffect::setDecal(bool value)
-{
-    if (d->decal != value) {
-        d->decal = value;
-        emit effectChanged();
-    }
-}
-
-/*!
-    \qmlproperty bool Effect::blending
-
-    This property should be set to true if alpha blending should be
-    enabled when this effect is active, or false otherwise.  The
-    default is false.
-
-    This property overrides the viewport-specific blending setting
-    that is specified by Viewport::blending.
-*/
-bool QDeclarativeEffect::blending() const
-{
-    return d->blending;
-}
-
-void QDeclarativeEffect::setBlending(bool value)
-{
-    if (d->blending != value) {
-        d->blending = value;
-        emit effectChanged();
-    }
-}
-
-/*!
-    \qmlproperty url Effect::texture
-
-    Texture effects are defined by this property.  A texture is
-    provided by means of a QUrl which is then used for texturing.
-
-    Textures can also be defined directly as images using the textureImage
-    property.
-
-    If the value is non-empty, and the texture could not be loaded from
-    the QUrl for any reason, then the property will not be changed.
-
-    \sa textureImage
-*/
-QUrl QDeclarativeEffect::texture() const
-{
-    if (!material())
-        return QUrl();
-    return material()->textureUrl();
-}
-
-void QDeclarativeEffect::setTexture(const QUrl& value)
-{
-    if (material() && material()->textureUrl() == value)
-        return;
-
-    if (d->progress != 0.0)
-    {
-        d->progress = 0.0;
-        emit progressChanged(d->progress);
-    }
-
-    if (value.isEmpty())
-    {
-        if (material())
-        {
-            material()->setTextureUrl(value);
-            emit effectChanged();
-        }
-    }
-    else
-    {
-        d->ensureMaterial();
-        // Warning: This will trigger the deletion of the old texure.
-        material()->setTextureUrl(value);
-        emit effectChanged();
-    }
-}
-
-/*!
-    \qmlproperty image Effect::textureImage
-
-    This property directly defines a texture using an existing QImage.
-
-    Textures can also be defined based on a URL using the texture property.
-
-    \sa texture
-*/
-QImage QDeclarativeEffect::textureImage() const
-{
-    return (material() && material()->texture()) ?
-                material()->texture()->image() : QImage();
-}
-
-/*!
-  \internal
-  Sets this effect to use \value as the image for it's texture.
-  
-  OpenGL defaults have been overridden to clamp the texture both horizontally and vertically as per QGL::Clamp.
-*/
-void QDeclarativeEffect::setTextureImage(const QImage& value)
-{
-    QGLTexture2D * tex;
-    d->ensureMaterial();
-    if (!material()->texture())
-    {
-        // Should this texture be parented?
-        tex = new QGLTexture2D();
-        material()->setTexture(tex);
-    } else
-    {
-        tex = material()->texture();
-    }
-
-    // Equality test of images can be very expensive, so always assign the
-    // value and emit effect changed
-    tex->setImage(value);
-    
-    // prevents artifacts due to texture smoothing wrapping around edges of texture 
-    tex->setHorizontalWrap(QGL::Clamp);
-    tex->setVerticalWrap(QGL::Clamp);
-    
-    emit effectChanged();
-}
-
-/*!
-    \qmlproperty Material Effect::material
-
-    Defines the material to apply to items that use this effect.
-*/
-QGLMaterial *QDeclarativeEffect::material() const
-{
-    if (!d->palette)
-        return 0;
-    return d->palette->material(d->materialIndex);
-}
-
-/*!
-  \internal
-  Sets the material for use with this effect.  Creates a QGLMaterialCollection
-  to contain it if necessary.
-*/
-void QDeclarativeEffect::setMaterial(QGLMaterial *value)
-{
-    d->ensureMaterial();
-    if (d->materialIndex != -1)
-        d->palette->material(d->materialIndex)->disconnect(this);
-    int newIndex = -1;
-    if (value)
-        newIndex = d->palette->addMaterial(value);
-    if (newIndex != d->materialIndex)
-    {
-        d->materialIndex = newIndex;
-        emit effectChanged();
-        // TODO: deleting old materials
-        if (value)
-            connect(value, SIGNAL(materialChanged()), this, SIGNAL(effectChanged()));
-    }
-}
-
-/*!
-    \qmlproperty real Effect::progress
-
-    Tracks how much of a remote resource has been downloaded, where 0.0
-    is no progress, and 1.0 is completion.
-*/
-
-/*!
-    \internal
-    Enable the effect on for a given \a painter.
-*/
-void QDeclarativeEffect::enableEffect(QGLPainter *painter)
-{
-    painter->setColor(d->color);
-    if (d->materialIndex != -1 && d->palette->material(d->materialIndex))
-    {
-        painter->setFaceMaterial(QGL::FrontFaces, material()->front());
-        painter->setFaceMaterial(QGL::BackFaces, material()->back());
-    } else
-        painter->setFaceColor(QGL::AllFaces, d->color);
-
-    QGLTexture2D *tex = 0;
-    if (material())
-        tex = material()->texture();
-    if (d->useLighting) {
-        if (tex && !tex->isNull()) {
-            if (d->decal)
-                painter->setStandardEffect(QGL::LitDecalTexture2D);
-            else
-                painter->setStandardEffect(QGL::LitModulateTexture2D);
-            tex->bind();
-        } else {
-            painter->setStandardEffect(QGL::LitMaterial);
-        }
-    } else {
-        if (tex && !tex->isNull()) {
-            if (d->decal)
-                painter->setStandardEffect(QGL::FlatDecalTexture2D);
-            else
-                painter->setStandardEffect(QGL::FlatReplaceTexture2D);
-//            painter->glActiveTexture(GL_TEXTURE0);
-            tex->bind();
-        } else {
-            painter->setStandardEffect(QGL::FlatColor);
-        }
-    }
-}
-
-/*!
-    \internal
-    Disable the effect for a given \a painter.
-*/
-void QDeclarativeEffect::disableEffect(QGLPainter *painter)
-{
-    painter->setStandardEffect(QGL::FlatColor);
-    painter->setColor(Qt::white);
-    painter->glActiveTexture(GL_TEXTURE0);
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-/*!
-  \internal
-  Set a scenenode's material and effect properties to enact this effect.
-
-  The desired functionality should mirror the Mesh::draw(QGLPainter*)
-  functionality as closely as possible.
-
-  Subclasses can reimplement this function to set desired effects (e.g. user
-  effects);
-*/
-void QDeclarativeEffect::applyTo(QGLSceneNode *node)
-{
-    d->ensureMaterial();
-
-    node->setPalette(d->palette);
-    node->setMaterialIndex(d->materialIndex);
-
-    Q_ASSERT(node->material());
-
-    QGLTexture2D *tex = material()->texture();
-    if (tex && !tex->isNull())
-        node->material()->setTexture(tex);
-
-    // Determine which standard effect to use
-    if (d->useLighting) {
-        if (tex && !tex->isNull()) {
-            if (d->decal)
-                node->setEffect(QGL::LitDecalTexture2D);
-            else
-                node->setEffect(QGL::LitModulateTexture2D);
-        } else {
-            node->setEffect(QGL::LitMaterial);
-        }
-    } else {
-        if (tex && !tex->isNull()) {
-            if (d->decal)
-                node->setEffect(QGL::FlatDecalTexture2D);
-            else
-                node->setEffect(QGL::FlatReplaceTexture2D);
-        } else {
-            node->setEffect(QGL::FlatColor);
-        }
-    }
-}
-
-QGLTexture2D *QDeclarativeEffect::texture2D()
-{
-    if (!material())
-        return 0;
-    return material()->texture();
-}
-
-/*!
-  Returns the progress of remote resource loading.
-  */
-qreal QDeclarativeEffect::progress()
-{
-    return d->progress;
-}
-
-QT_END_NAMESPACE