summaryrefslogtreecommitdiffstats
path: root/sync.profile
Commit message (Collapse)AuthorAgeFilesLines
* Add private module qt3dcoretestSean Harmer2017-08-031-0/+1
| | | | | | | | Static library containing helpers for unit tests to avoid having to build the same files 200 times. Change-Id: I89d63abbd7777a96276154298c2748e2d6774514 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move scene2d to own module and implement conditional plugin loadingAntti Määttä2017-02-281-0/+1
| | | | | | | | | | - Add quick3dscene2d module - Add importsscene2d qml module - Modify RenderAspect to load plugins conditionally - change autotests to match the module change Change-Id: If6596472acbd9a377561b2bfd2094a0585c781ac Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add skeleton quick3danimation librarySean Harmer2017-01-201-0/+1
| | | | | Change-Id: If4a76a4ab9840545b2f6ae71929e815cf6a1adaf Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Long live Qt3DAnimation and QAnimationAspect!Sean Harmer2017-01-201-0/+1
| | | | | | | | Add empty aspect that will provide key-frame animation support within Qt 3D. Change-Id: Ife26ad58229aada74c1c6eca2148fc97b22267b0 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-251-13/+0
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/core/resources/qframeallocator.cpp src/plugins/sceneparsers/gltf/gltfparser.cpp src/render/frontend/qrenderaspect.cpp tests/auto/render/renderqueue/tst_renderqueue.cpp Change-Id: Icdc2be2c80e7de6135a09e2f370ee004e395f514
| * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-13/+0
| | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: If4ad33246234c8d579e6c4f8c3acd9e5981de0ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Move last remaining pieces of examples-common to Qt3DExtrasPaul Lemire2016-05-011-0/+1
| | | | | | | | | | | | | | Also created a Quick3DExtras for QML related extras (Qt3DQuickWindow) Change-Id: I1b95ea841e07ac8d68a07a1911d783b722e6fe03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-231-0/+1
|/ | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a quick3dinput subprojectPaul Lemire2015-11-281-0/+1
| | | | | | | Will allow to create the QML specific extension classes Change-Id: I9075d77e6ae73c63fd60eef3ca400eb110e3b9dd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove incomplete collision aspectAndy Nichols2015-11-071-1/+0
| | | | | | | | | | | | It does not make sense to release the collision aspect as is as the API is not final, and no backends have been implemented yet. The collision aspect is also out of scope for the current release, and for now we will just support rudimentary collision support to enable picking by casting rays at bounding spheres in the render aspect. Task-number: QTBUG-49091 Change-Id: I6aa9e2a38d5e4974ea22b87aead1c0af93585f39 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-191-2/+2
| | | | | | | | This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Generate forwarding headers for public classes in Qt3D* namespacesSean Harmer2015-10-131-4/+2
| | | | | | | | This is in preparation for moving aspects into their own namespaces. Change-Id: Ie5e8eba97c87e31da63b94abe5244543228c01f2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add new collision aspectSean Harmer2015-08-101-0/+1
| | | | | | | | | | | | | This will implement a simple collision-only (no physics) aspect that can be used to detect when collisions occur between entities that aggregate collider components. It is also intended to provide a concrete implementation of the ray cast service to permit users to perform ray casts and to also allow the input aspect to correctly deliver input events to entities. Change-Id: I20012ebdb0b3f1b2014ccdab039e87973d112c16 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a new Logic aspect to allow synchronous operationsSean Harmer2015-08-061-0/+1
| | | | | | | | | | | | The QLogicComponent allows users to have code execute synchronously with the Qt3D engine each frame. Very useful for implementing some pieces of applicaton logic or for prototyping functionality that can later be folded back into Qt3D in a declarative manner. Change-Id: Ia7d69b77d782e67ace0a64a7c59188786fb731fd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/dev' into 5.5Oswald Buddenhagen2015-02-231-3/+0
|\
| * Remove incomplete bullet and OpenAL aspectsSean Harmer2015-02-191-3/+0
| | | | | | | | | | | | | | This can be reverted following the merge from dev -> 5.5. Change-Id: I7b85e64aa91d9ed81e3ef4d866e531056314d72e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update sync.profileSergio Ahumada2015-02-181-4/+4
|/ | | | | | | | make qt3d's dependencies use the same branch as qt3d Change-Id: I8648092da71d040b135678b5a93b5d815023b537 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Qt3D depends upon qtimageformats for webp images used in examplesSean Harmer2014-11-131-0/+1
| | | | | Change-Id: Ib6c6014fa8818f11acef798d645dca98a49b972b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Bump version to 5.5.0 and depend upon devGiuseppe D'Angelo2014-11-121-3/+3
| | | | | Change-Id: I6cfdca8c2b5bc7a19a6d8f12f7a98c5fb6b84879 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added empty QInputsAspectPaul Lemire2014-11-021-0/+1
| | | | | Change-Id: I188ae49f5ec183008a23c2efaeda973182125e57 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use new custom parser private api and switch to 5.4 branchSean Harmer2014-08-151-3/+3
| | | | | Change-Id: Ie47ce5da4abe9027ca192fbc5c096df49e0eaff5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Build newapi branch against dev nowSean Harmer2014-07-181-3/+3
| | | | | | Change-Id: I2bd39156991654b66ff7fb9c646af4c2bb706f29 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add Quick3DBulletPhysics QML pluginSean Harmer2014-06-281-0/+1
| | | | | | | | Don't build it yet as it's still empty and OS X doesn't like empty libs. Change-Id: Idd50ab685b4260fddc40604af9a0341e7a087b7f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add empty shell for a physics aspect using the Bullet engineSean Harmer2014-06-261-0/+1
| | | | | Change-Id: Ie2cfbc7ec6b6430f5b1cb7e8681591ac962be871 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Force creation of camelcase forwarding headersSean Harmer2014-06-121-0/+6
| | | | | | | | | | This works around the presence of the Qt3D namespace and the lack of Q prefixes on several classnames at this time. The class names will be tidied up but I'm not sure what to do about name collisions with other areas of Qt. For example, QTransform. Change-Id: I8f5a2ccf52496c624c0815e04b3153aa79b4803e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* OpenAL aspect empty shellPaul Lemire2014-05-311-0/+1
| | | | | Change-Id: I9b3eb51c3f40eb4dd5e746502e4d26b0703b1abd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QQmlExtensionPlugins for Qt3DCore and Qt3DRendererPaul Lemire2014-05-251-1/+2
| | | | | | | | | | | | | | | | | Quick3D components for core and renderer have been moved to their own module. For each module, a QQmlExtensionPlugin has been created and is installed in qtbase/qml/Qt3D/. To use the Qml API, 3dquick needs to added in the .pro. 3dquickrenderer can be added if subclassing Quick3D elements defined in Renderer. Otherwise, appending it is not necessary as the Qml engine will automatically load the QQmlExtensionPlugin. Core has no more reference to the QML module. Qt3DRenderer still has references to the QML module which will be remove in follow up patches. Change-Id: I0cd5cbd27020c776b9eb8d1548514df2b1321bbd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Quick3D independent libraryPaul Lemire2014-05-241-0/+1
| | | | | | | | | | | | | | | | In order to be able to have Qt3D work without dependencies to the Qml module, a dedicated Quick3D library has been set up for that purpose. It offers a QQuickWindow class which extends Qt3D::Window and allows to load a Qml source file. Examples have been updated to use QuickWindow. Note: There are still dependencies to the Qml module in Qt3DCore and Qt3DRenderer. This patch is a first step toward the removal of those. Follow up commits will completely remove those dependencies. Change-Id: I603eec8fb01b3706f648550b43b62356b0b4b4ac Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Relocate the render aspect outside of coreSean Harmer2014-03-291-1/+1
| | | | | Change-Id: I636442d2d71342fd248b90674176cede895feab2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rendering Aspect to dedicated Qt3D module library.Paul Lemire2014-03-251-0/+1
| | | | | | | | | | | | | | | | | | | Aspects are now independent Qt3D modules. This allows aspects to expose classes that can be reused by other aspects. Unlike plugins however, aspect modules have to be registered to the QAspectManager when the Qt3D window is created. At the moment there is only a single aspect : RendererAspect To load the RendererAspect QT += 3drenderer Examples updated to work with the changes. QML components defined in the RendererAspect are accessible by importing Qt3D.Render 2.0. Examples have been updated accordingly. Change-Id: I1281b1ffc1a633292b394c7d0460f1e16b34b488 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Removed old unused subdirs from sync.profile to get rid of eventual conflictsPaul Lemire2014-03-201-2/+0
| | | | | | Change-Id: Ib4bdf88255f97bcce7c5a89b57795baea42bc3f7 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix for Mac OS X 10.8 compilation issues.Pasi Keranen2014-02-141-1/+1
| | | | | | | | Changed used GL version to 3.2 and put use of double vector definitions behind #ifdef. Also removed references to old code from sync.profile. Change-Id: I806cd882de22f828fbacd162c71b71f52bbd5fbe Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Initial import of Qt3DCore and Renderer aspectSean Harmer2014-02-101-0/+1
| | | | | | | | | For now the renderer aspect is still compiled into the Qt3DCore library. This needs to be split out into a plugin so it can be loaded dynamically along with other future aspects. Change-Id: Iba8402b35c7ebc1c503d438c87aad77f5fef2261 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Remove unnecessary dependency to qtjsbackend from sync.profileSergio Ahumada2013-09-231-1/+0
| | | | | Change-Id: If71df520815e42b1b6749676cb8b0fd0f23f746c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* point dependencies to stable branchesOswald Buddenhagen2012-12-131-4/+4
| | | | | Change-Id: Ib699265ee8dd31f30282f2a4182e3d1debfdc9e3 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* build system cleanupsOswald Buddenhagen2012-06-241-11/+0
| | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) Change-Id: Ia77f205e3411d9661b4c794e1a78d4d530d27383 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-241-4/+0
| | | | | | | | this changes the library defines (*QT3D* => *3D*). i don't expect anyone to actually use them, so this should go without notice. Change-Id: Iae9bdead552325127fe78ae4054f5e8f8577ac40 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* sync.profile: remove dependency on qtsvg.Toby Tomkins2012-05-151-1/+0
| | | | | | | | sync.profile should not reference modules as dependancies unless they are actually required; update sync.profile accordingly. Change-Id: I2569c53ba2f5f2696bf194a8d868858021d5cc87 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Update Qt3d API like QML (QDeclarativeFoo -> QQuickFoo)Julian de Bhal2012-03-191-1/+1
| | | | | Change-Id: I99d965e514ff7fb7ada8dc164f82d99dac5fd94e Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Update for new QML naming.Sarah Smith2012-03-141-1/+1
| | | | | | | | | QML renaming must be done before the deprecation mechanism is turned off. Task-number: QTBUG-24722 Change-Id: I8e4b9c919eefa72184fa1745d10141885f83369c Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* sync.profile: introduce dependency on qtjsbackendRohan McGovern2012-01-111-0/+1
| | | | | | | | | | sync.profile needs to enumerate indirect dependencies too. qtdeclarative now depends on qtjsbackend; update sync.profile accordingly. Change-Id: Ib8d226062ea83bafa7d028b24cdd4fc8c96d103d Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* New Repo: updating references to qt3d/qt3dquick.Patrick Burke2011-12-121-0/+1
| | | | | Change-Id: I1f980fecc22780584b54704ec03c4d37439799ca Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Remove qtscript dependency.Sarah Smith2011-12-061-1/+0
| | | | | Change-Id: I6780c7a17bab5b10ef3b979d00fce741d75427a3 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Make build and pass tests under qt5Sarah Smith2011-07-201-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concatenated a number of fixes. Fixed QDeclarativeView errors. This class no longer exists under Qt5, being replaced by QSGView. Since that class also guarantees OpenGL, there is no need for the explicit QGLWidget create either. For now leave the QDeclarativeView3D class in place, but it is now redundant. Fixed "Project ERROR: QtQuick3D requires Qt Declarative" Currently, within qt5, it is possible to guarantee that _make_ runs over qtquick3d after its dependencies, but not possible to guarantee the same for _qmake_. Therefore we must avoid using any values of QT_CONFIG which are set while running qmake over our dependencies. Without this, an aggressively parallel build will pseudo-randomly fail depending on the order in which qmake is run. Fixed compile for QtDeclarative -> QtQuick1 split. Classes relating to QtQuick 1 were split into a new module separate from QtDeclarative. Update quick3d for this change. Update sync.profile dependencies to new syntax %dependencies now has a simpler format of gitmodule => gitref instead of using qt modules and keywords. Change-Id: If01d07da1ecf0ced4a9b5a36b2be39105ccffcbb Reviewed-on: http://codereview.qt.nokia.com/1819 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Add qt5 modularization stuff.Sarah Smith2011-07-181-0/+32
Change-Id: I8cbccbbb253f1c83d692aa92056774d70e7f0a7f Reviewed-on: http://codereview.qt.nokia.com/1720 Reviewed-by: Sarah Jane Smith
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 21:09:33 +0000