summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qabstractsceneloader.h
Commit message (Collapse)AuthorAgeFilesLines
* Port from Q_ENUMS to new macro Q_ENUM.Friedemann Kleint2015-05-131-1/+1
| | | | | | | | | Remove Q_ENUMS in favor of the new Q_ENUM macro which provides registration as meta enum and a debug stream operator. Change-Id: I39c61af189daebe2bf0c7474202da9f6110441c5 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Don't override pure virtual with a pure virtualSergio Martins2015-02-181-2/+0
| | | | | | | | | clang is complaining this is missing Q_DECL_OVERRIDE, so just remove it as it's already in the base class. Change-Id: Ie1a270fd29a3c94e43476a05fb5f15724aabf7f3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make scene parsers operate on URLs instead of raw filenamesLaszlo Agocs2015-02-131-4/+5
| | | | | | | | This way they are compatible with how mesh and texture source URLs are handled. Change-Id: Ifeee504fd3f5957d23f5cade92a73663488bdaf9 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>
* Have copy() only on QNodeKevin Ottens2014-10-161-1/+4
| | | | | | | | | | It was previously both on QNode and QNodePrivate. The one on QNodePrivate didn't give us much as it didn't eliminate the virtual of QNode. Change-Id: Ia1ea9dd831674109c84bd7005abe7fde3b1223fa Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNode refactoringPaul Lemire2014-10-031-2/+1
| | | | | | | | | | | | | | | | Move almost everything to private classes. Assimp loading restored. All examples working. QNode hierachy is now handled through QObject::setParent, addChild, removeChild are part of the private api. Note: commented QChangeArbiter unit tests as they can no longer work with this patch and will restore them when QChangeArbiter will have been made private. Task-number: QTBUG-41470 Task-number: QTBUG-41523 Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Refactored QAbstractSceneLoader and QSceneLoaderPaul Lemire2014-09-301-17/+12
| | | | | | | QNode, also to make deep clones and shallow clones. Change-Id: I38362485e3f7870da3d49aba95603fe4d61876fe Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractSceneLoader correct include guardPaul Lemire2014-09-291-3/+3
| | | | | | Change-Id: Ifa8f04b0bcc0fb33e39ee1a2ceb92987faa39bc7 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed QAbstractScene to QAbstractSceneLoaderPaul Lemire2014-09-281-0/+101
Change-Id: Ia97a8170a4112d22637222d70d67e6c9e5459a23 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>