summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender
Commit message (Collapse)AuthorAgeFilesLines
* Silence ICC warning about unused local variableThiago Macieira2017-04-071-1/+1
| | | | | | | | | | quick3dshaderdata.cpp(56): error #2415: variable "Qt3DRender::Render::Quick::<unnamed>::quick3DShaderDataTypeId" of static storage duration was declared but never referenced Since the initialization has side effects, we need to keep the variable, so just mark it unuse. Change-Id: I27b55fdf514247549455fffd14b1c9712ac05281 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge branch '5.8' into 5.9Sean Harmer2017-04-0240-71/+92
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/jobs/qthreadpooler.cpp src/core/nodes/qcomponent.cpp src/core/qpostman.cpp src/core/qscene_p.h src/core/services/qservicelocator_p.h src/input/frontend/qinputaspect.cpp src/plugins/sceneparsers/assimp/assimpimporter.cpp src/plugins/sceneparsers/assimp/assimpimporter.h src/plugins/sceneparsers/gltf/gltfimporter.h src/plugins/sceneparsers/gltf/gltfio.cpp src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp src/quick3d/imports/render/qt3dquick3drenderplugin.cpp src/quick3d/quick3dextras/qt3dquickwindow.cpp Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
| * Coding convention fix for Src/Quick3DRobert Brock2017-04-0140-71/+92
| | | | | | | | | | | | | | | | Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I60008858a4975621b9159d909908b6bba2f98f14 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Move scene2d to own module and implement conditional plugin loadingAntti Määttä2017-02-289-1661/+2
| | | | | | | | | | | | | | | | | | | | - Add quick3dscene2d module - Add importsscene2d qml module - Modify RenderAspect to load plugins conditionally - change autotests to match the module change Change-Id: If6596472acbd9a377561b2bfd2094a0585c781ac Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | QShaderData: fix texture support in propertiesKevin Ottens2017-02-241-5/+3
| | | | | | | | | | | | | | | | There was only code dealing with sub-shader data but nothing allowing to check if a property was a texture, this is now properly handled. Change-Id: I48984727eff975e9f3e2c21c5185b336efc963fd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Cleanup scene2d console messages at startupAntti Määttä2017-02-171-2/+2
| | | | | | | | | | | | | | | | | | Change warnings to debug messages so that hey won't be logged by default. Task-number: QTBUG-58534 Change-Id: Ib84986df2bde9325c0491d9ed0a32e7c40b5c8d8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QMemoryBarrier cleanupPaul Lemire2017-02-162-8/+8
| | | | | | | | | | | | | | | | | | | | | | -rename barriertypes to waitOperation -in QML introduce a waitFor property -remove the Barrier suffix for the enum values -rename BarrierType to Operation Task-number: QTBUG-58878 Change-Id: Idc65f44b09e632509cd74286de26fea02e6b6dee Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix Clang warnings: out of order initializationMike Krus2017-02-111-3/+3
| | | | | | | | | | Change-Id: Iea0b93082167bda9502e6947f213ab3430fa00d1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix texture binding on macosAntti Määttä2017-01-301-4/+11
| | | | | | | | | | | | | | | | | | | | It seems that the format of the context being shared must be the same, otherwise sharing doesn't work. Also fix crash at the startup, which happens because the m_shareContext is not initialized. Change-Id: Ie654b684bcead1d85dee239dba02be798672f278 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix scene2d autotest shutdown crashAntti Määttä2017-01-301-3/+5
| | | | | | | | | | Change-Id: I0a4e12243b8fcf80d4849879211b87448096fab0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch 'wip/qtquickintegration' into devSean Harmer2017-01-299-2/+1652
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick3d/imports/render/qt3dquick3drenderplugin.cpp src/render/backend/triangleboundingvolume.cpp src/render/backend/triangleboundingvolume_p.h src/render/frontend/qrenderaspect.cpp src/render/frontend/sphere.cpp src/render/frontend/sphere_p.h src/render/jobs/pickboundingvolumejob.cpp src/render/jobs/pickboundingvolumejob_p.h src/render/picking/objectpicker.cpp src/render/raycasting/qcollisionqueryresult_p.h src/render/render.pro src/src.pro tests/auto/render/objectpicker/tst_objectpicker.cpp tests/auto/render/render.pro Change-Id: I95717c7855887850d5c90e7ad8f19f1ffb37a545
| * | Change renderOnce to RenderPolicy enumAntti Määttä2017-01-275-33/+43
| | | | | | | | | | | | | | | Change-Id: Ie37085ec884034c0f080c782ec44505f046c50bd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Add QmlEngine contructor parameter to Scene2DAntti Määttä2017-01-273-4/+55
| | | | | | | | | | | | | | | | | | Change-Id: I841f4f8e516d6b3656ed2dbc9ee694d25b4be78f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Use only one thread in the scene2d rendererAntti Määttä2017-01-264-23/+44
| | | | | | | | | | | | | | | | | | | | | | | | Make all scene2d backend renderers use shared thread Change-Id: I019f463023198aa73f1f64a8d1f9d7b63b962d0c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Resend render event when texture is not in useAntti Määttä2017-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that it gets rendered when there is no animation Change-Id: Ib72808bedaa4a2847932e496980a7fc17fea7bba Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Add Scene2D logging categoryAntti Määttä2017-01-264-5/+121
| | | | | | | | | | | | | | | | | | Change-Id: Ie327f139095e71b30accca212509be5f655e2ebf Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Fix scene2d unit testsAntti Määttä2017-01-262-9/+11
| | | | | | | | | | | | | | | | | | Change-Id: Id3caa548ad906647488a343cf0c68f176270f319 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Fix qscene2d autotestsAntti Määttä2017-01-261-5/+10
| | | | | | | | | | | | | | | | | | Change-Id: I650f3b3b180ce9a5ed323060f303baaa670cf8be Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Update scene2d implementationAntti Määttä2017-01-266-208/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add inline qml support with QQuickItem as default property. Change output to QRenderTargetOutput. Change backend node to use resource accessor and implement own fbo creation. Add event support. Change-Id: Ieb82b986696b00ba026ac9ab08c8dcbe87e84b1c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Change namespaceAntti Määttä2017-01-245-24/+44
| | | | | | | | | | | | | | | Change-Id: I53e86f988f14a4e5748c1a13599461effb8d8462 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Move scene2d to quick3drenderAntti Määttä2017-01-245-0/+1346
| | | | | | | | | | | | | | | Change-Id: Id3decbf809e69fe0957a168b3675b83933670641 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Merge branch 'dev' into wip/qtquickintegrationSean Harmer2017-01-202-0/+23
| |\ \ | | | | | | | | | | | | Change-Id: Ic0ba8234860bf6a020a3ffae3d3e45b38e286ab5
| * | | Add scene2d to quick3drenderAntti Määttä2017-01-182-0/+6
| | |/ | |/| | | | | | | | | | | | | | | | RenderQmlToTexture will eventually be renamed to Scene2D and moved here. Change-Id: I7ed0637eefa7d7621f710cbe9ff453d6d75e90ed Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | | Add Quick3DMemoryBarrierPaul Lemire2017-01-253-2/+163
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Needed to work around the fact that QFlags aren't supported as a QML property type. And modify QMemoryBarrier to work with it -> remove the Q_PROPERTY from QMemoryBarrier (it's in QUick3DMemoryBarrier) -> properly send the notification change (since there's no Q_PROPERTY) -> adjust AllBarriers values so that we can use QFlags &= to set it (|= not available with ints) Change-Id: Ide5b1c774fbbb1df745857b78ca353038b3cc052 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Quick3DBuffer: add helper method to read binary filePaul Lemire2017-01-132-0/+23
|/ | | | | Change-Id: Ib96806720171cddc990f4b0df59a8690d56bc605 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove CONFIG+=static when gcov is enabledPaul Lemire2016-11-231-1/+0
| | | | | | | | Is actually counterproductive as we end up with almost no coverage data. Change-Id: Ib3beed103586cc68be90459de23818c2fbcb26c8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* LCOV exclusion comments squashedPaul Lemire2016-11-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a combination of 60 commits. qlockableobserverinterface_p.h: add LCOV exclusion comments qobserverinterface_p.h: add LCOV exclusion comments qpostman_p.h: add LCOV exclusion comments qsceneobserverinterface_p.h: add LCOV exclusion comments qscene_p.h: add LCOV exclusion comments qnodeid.h: add LCOV exclusion comments quick3dshaderdataarray_p.h: add LCOV exclusion comments quick3dshaderdata_p.h: add LCOV exclusion comments qquaternionanimation_p.h: add LCOV exclusion comments qabstractphysicaldeviceproxy_p.h: add LCOV exclusion comments qmouseevent.h: add LCOV exclusion comments qmousedevice.h: add LCOV exclusion comments qaxisaccumulator.h: add LCOV exclusion comments qtextureimagedatagenerator.h: add LCOV exclusion comments qtexturewrapmode.h: add LCOV exclusion comments qabstracttexture.h: add LCOV exclusion comments qtextureimage.h: add LCOV exclusion comments texture_p.h: add LCOV exclusion comments qtexturegenerator.h: add LCOV exclusion comments qsortpolicy.h: add LCOV exclusion comments qrendertargetselector.h: add LCOV exclusion comments qsortcriterion.h: add LCOV exclusion comments qclearbuffers.h: add LCOV exclusion comments qrendercapture_p.h: add LCOV exclusion comments uniform_p.h: add LCOV exclusion comments triangleboundingvolume_p.h: add LCOV exclusion comments qgeometryfactory.h: add LCOV exclusion comments qbuffer_p.h: add LCOV exclusion comments qbuffer.h: add LCOV exclusion comments qgeometryrenderer.h: add LCOV exclusion comments qbufferdatagenerator.h: add LCOV exclusion comments qattribute.h: add LCOV exclusion comments qsceneiohandler_p.h: add LCOV exclusion comments qsceneloader.h: add LCOV exclusion comments qrendersettings.h: add LCOV exclusion comments qcamera.h: add LCOV exclusion comments qcameralens.h: add LCOV exclusion comments sphere_p.h: add LCOV exclusion comments shaderdata_p.h: add LCOV exclusion comments qshaderdata.h: add LCOV exclusion comments qgraphicsapifilter.h: add LCOV exclusion comments qshaderprogram.h: add LCOV exclusion comments qpointsize.h: add LCOV exclusion comments qblendequation.h: add LCOV exclusion comments qstenciltestarguments.h: add LCOV exclusion comments qalphatest.h: add LCOV exclusion comments qstenciloperationarguments.h: add LCOV exclusion comments qdepthtest.h: add LCOV exclusion comments qblendequationarguments.h: add LCOV exclusion comments qfrontface.h: add LCOV exclusion comments qcullface.h: add LCOV exclusion comments qray3d_p.h: add LCOV exclusion comments qboundingvolume_p.h: add LCOV exclusion comments qabstractcollisionqueryservice_p.h: add LCOV exclusion comments qpickevent.h: add LCOV exclusion comments qabstractlight.h: add LCOV exclusion comments light_p.h: add LCOV exclusion comments qt3dquickwindow.h: add LCOV exclusion comments scene3ditem_p.h: add LCOV exclusion comments qgraphicsapifilter_p.h: add LCOV exclusion comments Change-Id: I3af0e2a4d85685c919dbfaa8b3f384777f026542 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* MSVC2015_64 "internal compiler error" fixesv5.8.0-alpha1Tomi Korpipää2016-08-313-7/+8
| | | | | | Change-Id: I8b67b6932eca7ada6ac44521b8a1a526eb0553e5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Adjust to qtConfig() changes in qtbaseLiang Qi2016-08-211-2/+0
| | | | | Change-Id: Ic5b9447ef9ba54124553775b973d616af22b7032 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add partial data update support for QBufferOleg Evseev2016-08-132-9/+21
| | | | | | | | | | | Perform upadateData through queue of replacements specified by QBufferUpdate: start position (offset) and QByteArray (replacing data) Add example based on custom-mesh-cpp to show how updating data works. Task-number: QTBUG-50720 Change-Id: I2eceb514af21209deb278d73c94773e39f300fb3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Quick3DBuffer: do not always convert from QJSValuePaul Lemire2016-07-171-2/+10
| | | | | | | | | | | | In most cases when Quick3DBuffer::setBufferData is called, the QVariant parameter contains a QJSValue. In some cases though, such as when the data property of a Quick3DBuffer is set from a C++ data model, the QVariant may contain a QByteArray directly. Doing the QJSValue conversion in that case would result in a failure as the data set would be 0. Perform the proper QVariant conversion based on the contained type. Change-Id: I263d275fd780f57a67f11c9ca47c5d6f8ddf7a23 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.6' into 5.7Sean Harmer2016-05-191-1/+1
|\ | | | | | | Change-Id: Ie0fc178d3c0f818ea32aac0e98c97861d4c0f671
| * Eliminate references to dead memoryWieland Hagen2016-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | Buffer data upload from QML would not copy the buffer data from the JS buffer class, but just store a pointer to it. JS Garbage collection may free that memory while it is still used by QBuffer Task-number: QTBUG-51667 Change-Id: I366e4e8ad601f058ae022ec4b4978e18eed0e395 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Enable QT_NO_FOREACH for all Qt3D libraries and pluginsMarc Mutz2016-05-141-0/+3
| | | | | | | | | | | | | | | | Qt3D contains no Q_FOREACH loops anymore. Enable QT_NO_FOREACH so it stays that way. Change-Id: I1079ff1d87a7d6b38b9e9684e9d9f85561602b0a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | quick3d: eradicate Q_FOREACH loops [low-risk]Marc Mutz2016-05-1413-27/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | ... by replacing them with C++11 range-for loops. This is the batch with low-risk changes. They operate on local containers or the loop body clearly does not cause the container to change. Sprinkled in a reserve() or two. Change-Id: I5a3da485213791ae58c82f4a81829cfba558a3d6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Introduce local macros for declaring types as movable/primitive/sharedMarc Mutz2016-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtCore macros aren't really suited to a namespaced library like Qt3D. In particular, the use of Q_DECLARE_SHARED is wrong, because it places the free swap() function in the Qt's namespace when it should be in the same (inner) namespace the type is in. Q_DECLARE_TYPEINFO, otoh, is just inconvenient to use because it requires exiting and later re-entering of the Qt3D namespace(s). The new macros do this implicitly. Change-Id: Ic91f447656f08ed59c118ce09cb5ac90ad212955 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Get rid of QLayer::namesKevin Ottens2016-05-043-0/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | Don't reinvent a variable naming system (string based global variables even) and instead use pointer to QLayer instance everywhere, even with QLayerFilter. The wave and deferred-renderer-cpp examples have been ported to the new API. Change-Id: I82a858770954a8743a5c3d2ce0c463e62844871f Task-number: QTBUG-51440 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Make QAbstractNodeFactory privateSean Harmer2016-05-011-1/+1
| | | | | | | | | | | | Task-number: QTBUG-51497 Change-Id: I0517aead1f2ab004e3b5e053d96561d88feb060c Reviewed-by: Volker Krause <volker.krause@kdab.com>
* | Q_NULLPTR -> nullptrSean Harmer2016-05-017-11/+11
| | | | | | | | | | | | Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Strip out cloning subsystemSean Harmer2016-04-294-15/+8
| | | | | | | | | | Change-Id: I4def54a11de0f9c676ef6b2d7bd8e723ded25ab9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Rename QTechniqueFilter::criteria() to matchAll()Sean Harmer2016-04-271-3/+3
| | | | | | | | | | | | | | As per API review. Change-Id: Icaf9d489b760f5df101141f2662e44658575e850 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Moves QSortCriterion flag to QSortPolicy and remove itFranck Arrecot2016-04-263-189/+0
| | | | | | | | | | | | Change-Id: I44f71671ead23256d5fdc621545492885ff940a5 Task-id: QTBUG-51486 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QNode: make cleanup a private slotPaul Lemire2016-04-232-6/+0
| | | | | | | | | | | | | | | | | | | | QT3D_CLONEABLE now implements a default dtor that calls _q_ cleanup QT3D_CLONEABLE_CUSTOM_DTOR is used for classes that really need to implement their own dtor but they need to invoke _q_cleanup manually Change-Id: I2937a3b9edeb5a763749f0044360d78ab4461a5e Task-number: QTBUG-51464 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QVectorize Quick3DShaderDataArrayRobert Brock2016-04-212-3/+3
| | | | | | | | | | Change-Id: I68f7ce1995534a6775d26ecaa936c47f3a18e35a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QVectorize QRenderTargetSelectorWieland Hagen2016-04-201-1/+1
| | | | | | | | | | Change-Id: Icae15aef51a623ea543edad9d04513d59e94273b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.6' into 5.7Sean Harmer2016-04-162-7/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * standardize statement order in project files a bitOswald Buddenhagen2016-02-251-2/+1
| | | | | | | | | | Change-Id: I0e9e180145dcedb5afb8a534b6ac2bfd773262f9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * rely on the automatically defined QT_BUILD_*_LIBOswald Buddenhagen2016-02-252-3/+1
| | | | | | | | | | Change-Id: Ib4667e1d11309e76f60150eb4e474dbc1b4191ce Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+1
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ied46fc47e5f998053ab8a31547e09676144a65c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QAbstractTextureProvider renamed to QAbstractTexturePaul Lemire2016-04-061-1/+1
| | | | | | | | | | | | Change-Id: If8ea2c9806e28f6d97eb3fb852686647c0c04d8f Task-number: QTBUG-51504 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>