summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qtextureimage.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Use Qt3D.Renderer rather than RenderSean Harmer2015-06-111-2/+2
| | | | | | | | | | | This should make the documentation and code terminology consistent throughout. We can rename the source directories at a later date if needed. Task-number: QTBUG-46622 Change-Id: I2737e54192341808f4a0270ad19ba70f6c4af589 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Doc: Add Qt3D QML and C++ skeleton comments for qdocMartin Smith2015-05-281-1/+32
| | | | | | | | | | | | | | Add documentation structure and qdoc comments for \class, \qmltype, \property, and \qmlproperty, etc, for the Qt3DRender C++ and QML modules. The actual documentation (descriptions) are still missing, but this allows the QML type documentation to be generated and reduces the qdoc error count. Change-Id: I9e96241f07ca2388f1a8cc2a3677fa6d02a2404d Task-number: QTBUG-46037 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Do not pass `this` to Private c-torKonstantin Ritt2015-05-201-3/+3
| | | | | | | For classes derived from QNodePrivate, it is not used anymore. Change-Id: I9573042500c2c7533687d251e72bac14cb793525 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix multiple C++ documentation issuesTopi Reinio2015-04-141-3/+3
| | | | | | | | | | | | | | | | | | | - Remove multiple \namespace commands for namespace Qt3D. QDoc in 5.5 is now able to collate namespace members from multiple modules. - Mark 'Q...Private' classes and functions taking private arguments as \internal - Use correct \qtvariable for Qt 3D Core and Render - Add src/plugins directory to Qt 3D Core documentation build to correctly generate Assimp-related documentation. - Ensure documentation for C++ properties is visible by using the \property command instead of documenting the setter/getter functions. - Add export and logging macros to qdoc ignore directives - Remove unnecessary use of \fn command - Language and styling fixes Change-Id: I2481fa30ad2f6869b85c038c20ff1730b8522d46 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Make mesh source url resolving compatible with QuickLaszlo Agocs2015-02-131-1/+2
| | | | | | | | The ideal way would be to call the function from QQmlFile but that would need a dependency on the qml module. So just copy the function in. Change-Id: If34d8a2356bbe87b2a011c1c25a79a3f24ebb1ab Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Copyright header change.Mika Salmela2015-02-091-19/+14
| | | | | | | | As for preparation for Qt5.5 release the copyright header is updated to correspond the current license requirements. Change-Id: I36632918b66f455539453b42c369689fb11298ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Texture API refactoringPaul Lemire2015-02-081-1/+14
| | | | | | | | | | * Added LoadTextureDataJob * QAbstractTextureProvider: maximum layers property * Automatic QAbstractTextureProvider::TextureFormat added * material-qml should work perfectly with that patch. Change-Id: I3f92f13b783155798772086304a30126a4fc687d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractTextureImage: add update methodPaul Lemire2015-02-081-0/+2
| | | | | | | | update send a new functor to the backend. Should be called by subclasses when the functor has been updated. Change-Id: I18f42b1d276b9b3b06de314754ba40a81f4b9f67 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move QAbstractTextureImage, QTextureImage to dedicated filesPaul Lemire2015-02-081-0/+147
Change-Id: I4650ecad1b4c07531c8cd56c11976005bb543aed Note: qtexture.h is now just a convenience include. Reviewed-by: Sean Harmer <sean.harmer@kdab.com>