| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
This way we will avoid inconsistencies. It also means making some of the
copy() implementations more clever.
Change-Id: Ic79c9ec7c9c32f8951d5d9f5184592880bf8d5fd
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
Note: As we are using QScene during cloning, it is important that node hierarchy
be created and added in the proper order (parent then child).
Change-Id: I8fd53f7ca696ec9aca19cc70dc116ccba4154911
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Since winuser.h contains a DrawState #define, this tends to wreck havoc on
Windows. This patch respectively renames QDrawState, Qt3D::Render::DrawState
and Qt3D::Render::DrawStateSet to QRenderState, Qt3D::Render::RenderState and
Qt3D::Render::RenderStateSet. While this is more invasive than just
undefining DrawState, it should be more foolproof too.
Change-Id: I9fa86e5bf1fe41fb4839bd146822cc43e26019e6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Ibff94903c25b8145088b5a4109304b17a3a9d900
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
Change-Id: Ib93c2aba1f25204c06c40463699ad7f4140f604b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|