qt/qt3d.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move defaults and geometries out of Qt3DRender and into Qt3DExtras	Paul Lemire	2016-04-23	1	-105/+0
\| \| \| \| \| \| \|	QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
*	Merge branch '5.6' into 5.7	Sean Harmer	2016-04-16	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/qt3d/examples-common/qorbitcontrol.h src/core/qnodecreatedchange.cpp src/core/qnodecreatedchange.h src/input/frontend/qaxisactionhandler.h src/input/frontend/qinputaspect.h src/input/frontend/qkeyboardhandler.h src/input/frontend/qmousedevice.h src/input/frontend/qmousehandler.h src/input/frontend/qphysicaldevicecreatedchange.h src/input/input.pro src/logic/qframeaction.h src/plugins/sceneparsers/assimp/assimp.pro src/quick3d/imports/input/importsinput.pro src/quick3d/imports/render/importsrender.pro src/render/backend/trianglesextractor.cpp src/render/framegraph/qclearbuffer.h src/render/framegraph/qlighting.h src/render/framegraph/qstateset.h src/render/frontend/qrenderattachment.h src/render/geometry/qabstractattribute.h src/render/geometry/qabstractbuffer.h src/render/geometry/qattribute.h src/render/geometry/qboundingvolumespecifier.h src/render/geometry/qbuffer.h src/render/materialsystem/qfilterkey.h src/render/materialsystem/qparameter.h src/render/materialsystem/qparametermapping.h src/render/renderstates/qblendstate.h src/render/renderstates/qdepthmask.h src/render/renderstates/qpointsize.cpp src/render/renderstates/qrenderstatecreatedchange.cpp src/render/renderstates/qstencilop.h src/render/renderstates/qstencilopseparate.h src/render/renderstates/qstenciltestseparate.h src/render/texture/qabstracttexture.h src/render/texture/qabstracttextureimage.h src/render/texture/qtextureproviders.h Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4
\| *	Make public headers compile with -Wzero-as-null-pointer-constant	Marc Mutz	2016-03-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... or equivalent. Task-number: QTBUG-45291 Change-Id: I1453477ad718335ca6c5c0c3447539cb93e21176 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* \|	Unify license header usage	Antti Kokko	2016-01-26	1	-11/+14
\|/ \| \| \| \| \| \|	Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
*	Added parameters to signals and made setters Q_SLOTS	Tomi Korpipää	2015-12-09	1	-8/+10
\| \| \| \| \| \|	Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
*	QCylinderGeometry: remove QT3D_CLONEABLE	Paul Lemire	2015-11-12	1	-1/+0
\| \| \| \| \|	Change-Id: I000a6060f7808a59e2511fc85fb3ed9977ed8012 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
*	QCylinderGeometry: expose attributes as properties	Paul Lemire	2015-10-24	1	-0/+10
\| \| \| \| \|	Change-Id: I525b3ce19a5c98c8015c295363e6fe49e99e3409 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
*	Rename Renderer -> Render throughout	Sean Harmer	2015-10-19	1	-3/+3
\| \| \| \| \| \| \| \|	This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
*	Move geometry related classes to their own directory	Sean Harmer	2015-10-13	1	-0/+91
	Change-Id: I74fdfceeeca4801c51fba3586404d5b5dab771b4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>