summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove Qt6 QT_VERSION checks from the code basePaul Lemire2023-02-101-4/+0
| | | | | | | | | | Those are left overs from the Qt 5.15 to Qt 6 port. Now that both code based have diverged, there's no much point in keeping those checks. Pick-to: 6.5 Change-Id: I4e83876b6b4cb18b181af32e376f4411054a1183 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Use SPDX license identifiersLucie Gérard2022-06-221-38/+2
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I8105424281eed871037fa6c463871ca8829876b5 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* 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-3/+1
| | | | | Change-Id: Ieacfbfb25de4840d7c428f89cd1f7d178852036e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge branch '5.9' into devSean Harmer2017-08-191-1/+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-4/+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>
* Add skeleton quick3danimation librarySean Harmer2017-01-201-0/+76
Change-Id: If4a76a4ab9840545b2f6ae71929e815cf6a1adaf Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>