summaryrefslogtreecommitdiffstats
path: root/src/extras/defaults/qphongalphamaterial.h
Commit message (Collapse)AuthorAgeFilesLines
* Switch export macros to standard formKai Koehne2019-04-021-1/+1
| | | | | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Also remove non-exising QT3DLOGIC_PRIVATE_EXPORT macro from src/doc/qt3d.qdocconf Task-number: QTBUG-74752 Change-Id: I71b9e85ff09c002fb283824aa51a5a8f50e937f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Coding convention fix for Src/ExtrasRobert Brock2017-04-011-3/+3
| | | | | | | | Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I76f4eeb93b02b20f1d85d745f39253fd22327ef7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QPhongAlphaMaterial: allow to specify the blending argumentsPaul Lemire2016-08-191-0/+23
| | | | | | Change-Id: I4448e59f52ab8101c26448de5e0b8d3832461c53 Task-number: QTBUG-54591 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Q_NULLPTR -> nullptrSean Harmer2016-05-011-1/+1
| | | | | | Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-231-0/+94
QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>