summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3d/qt3dquicknodefactory.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update QtQuick API to build with 5.15Mike Krus2021-01-111-0/+4
| | | | | | | Haven't tried to run anything, it just builds Change-Id: I6c2c2a949bc3892a363697cf38f1608af87c303c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependenciesMike Krus2020-02-071-1/+1
| | | | | | | | | | - Fix build for change in QML private syntax and relocation of OpenGL headers - Fix some deprecation warnings - Update include paths - Update module dependencies Change-Id: I03e65a46b18a9dea872fe2250d5b4fe28128f4e8 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Re-enable the QQmlType code paths in the node factoriesSean Harmer2017-08-251-5/+1
| | | | | Change-Id: Ieacfbfb25de4840d7c428f89cd1f7d178852036e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge branch '5.9' into devSean Harmer2017-08-191-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/backend/renderer.cpp src/render/backend/renderview.cpp src/render/graphicshelpers/graphicscontext_p.h src/render/graphicshelpers/graphicshelperes2_p.h src/render/graphicshelpers/graphicshelpergl2_p.h src/render/graphicshelpers/graphicshelpergl3_2_p.h src/render/graphicshelpers/graphicshelpergl3_3_p.h src/render/graphicshelpers/graphicshelpergl4_p.h src/render/graphicshelpers/graphicshelperinterface_p.h src/render/jobs/pickboundingvolumejob.cpp tests/auto/animation/clipanimator/tst_clipanimator.cpp tests/auto/auto.pro tests/manual/manual.pro Also disabled the QQmlMetaType codepaths following commit 49a11e882059ee1729f776722e085dd21d378c36 in qtdeclarative. The QQmlMetaType codepaths will be re-enabled once a qt5.git integration has succeeded. Change-Id: Ia654d75425e6d406c472d19864383612208cad2b
| * Fix Quick3DNode factories following QQmlType changesPaul Lemire2017-08-161-3/+1
| | | | | | | | | | Change-Id: I333485024f4c5534d8f2bf6ee301ba52638e6126 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Disable QQmlType codepathsPaul Lemire2017-08-031-0/+2
|/ | | | | | | Will allow to update the qt5.git configuration without breaking the CI Change-Id: I16d7e2af9da935d4d31f5909575c8edec4a9432e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Coding convention fix for Src/Quick3DRobert Brock2017-04-011-0/+1
| | | | | | | | 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>
* Q_NULLPTR -> nullptrSean Harmer2016-05-011-2/+2
| | | | | | Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Unify license header usageAntti Kokko2016-01-261-12/+15
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-131-2/+2
| | | | | | | Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Create proper Quick extended classes in scene loadersLaszlo Agocs2015-08-201-0/+73
This allows exploring the loaded subtrees from QML/Javascript code. The C++ classes are not suitable for this as they lack properties that involve QML specifics. The assimp (QML) example is updated to show how to do this (with the help of some C++ code). Say hello to the pulsating torus and the rotating monkey! Change-Id: I60401272105df5d72f4b7afebe26a3271e92f19e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 07:49:56 +0000