summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.1Topi Reinio2016-05-131-1/+1
| | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I477b72161e1f743a4e0925dacb38a05a3dd93946 Task-number: QTBUG-52953 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Insert a void cast to silence Clang -Wdynamic-class-memaccess warningThiago Macieira2016-05-081-1/+1
| | | | | | | qresourcemanager_p.h:177:20: warning: destination for this 'memset' call is a pointer to dynamic class 'Buffer'; vtable pointer will be overwritten [-Wdynamic-class-memaccess] Change-Id: Id75834dab9ed466e94c7ffff144489ec85f57f00 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Eliminate references to dead memoryWieland Hagen2016-05-041-1/+1
| | | | | | | | | | Buffer data upload from QML would not copy the buffer data from the JS buffer class, but just store a pointer to it. JS Garbage collection may free that memory while it is still used by QBuffer Task-number: QTBUG-51667 Change-Id: I366e4e8ad601f058ae022ec4b4978e18eed0e395 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Enable rtti for assimpSean Harmer2016-04-191-1/+1
| | | | | | | | Allows to build with mingw. Task-number: QTBUG-52619 Change-Id: Ie5b3fc4a5d4ad13cdd93575b4dac9b466f475bbf Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Fix missing namespace in SceneManagerJanne Koskinen2016-04-191-1/+1
| | | | | | | | Needed by GCC 4.4.x to compile. Task-number: QTBUG-51879 Change-Id: I36c91a8a164a50a7f222e05d6722a2d29cbb983f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix ICC warning about variable used uninitializedThiago Macieira2016-04-121-1/+1
| | | | | | | | std::tuple<> apparently has a trivial constructor, so it really is uninitialized. Change-Id: Id75834dab9ed466e94c7ffff1444801e4bf0d7dc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Ignore ICC warning about change of sign in AssimpThiago Macieira2016-04-121-4/+9
| | | | | | | | | | You can't assign -1 to an unsigned and expect it to retain the sign. Assimp has a lot of those and should be fixed (it's not portable to assume -1 becomes ~0). But since this is a third-party library, it's not worth my time to submit a patch. Change-Id: Id75834dab9ed466e94c7ffff14448010fe7e0c90 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix icc warnings: "else" was missingThiago Macieira2016-04-121-1/+1
| | | | | Change-Id: Id75834dab9ed466e94c7ffff14447ec2379c5b17 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix a typoVenugopal Shivashankar2016-04-081-1/+1
| | | | | | Task-number: QTBUG-52396 Change-Id: I1e063e68e6102bb22c21ddb7006e08093f592b36 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-225-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I45f0404fedf58c3ec3380ba9adc26b1883007299 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Export QAbstractAspectJobManagerMarc Mutz2016-03-211-1/+1
| | | | | | | | | It is used in libQt3DRender.so. Fixes UBSan build, which requires access to the typeinfo object, even though only inline methods and data members are accessed. Change-Id: I96a5bf5887c30feb55e044bca02be86c76e124cf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-03-214-13/+13
|\ | | | | | | | | | | | | Conflicts: tools/qgltf/qgltf.cpp Change-Id: I60ffe68e1e3419b3e329409dd774bab5ead6e8ae
| * Fix build in C++98 mode: enums aren't namespacesv5.6.0Thiago Macieira2016-03-034-13/+13
| | | | | | | | | | | | | | trianglesextractor.cpp:73:28: error: ‘Qt3DRender::QAttribute::DataType’ is not a class or namespace Change-Id: Ic747cc2ab45e4dc6bb70ffff14384407a2997a70 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-01105-180/+180
| | | | | | | | | | | | | | | | ... or equivalent. Task-number: QTBUG-45291 Change-Id: I1453477ad718335ca6c5c0c3447539cb93e21176 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | standardize statement order in project files a bitOswald Buddenhagen2016-02-253-6/+3
| | | | | | | | | | Change-Id: I0e9e180145dcedb5afb8a534b6ac2bfd773262f9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | fix dependenciesOswald Buddenhagen2016-02-252-6/+5
| | | | | | | | | | | | | | remove excess ones and don't over-expose private ones. Change-Id: Ie0a39117de0f6f25ea7231cb67c2cd8d723c04e3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | fix copy&paste-oOswald Buddenhagen2016-02-251-1/+1
| | | | | | | | | | Change-Id: Ia5af91fdbcb44addef1501b75eb927a19107b82a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | rely on the automatically defined QT_BUILD_*_LIBOswald Buddenhagen2016-02-2514-21/+9
| | | | | | | | | | Change-Id: Ib4667e1d11309e76f60150eb4e474dbc1b4191ce Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-2512-30/+29
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ied46fc47e5f998053ab8a31547e09676144a65c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-151-0/+10
|\| | | | | | | Change-Id: I1779d4d77ecfeadb6449e7fa99c9b9d5004d060f
| * Fix WEC7 buildv5.6.0-rc1Andreas Holzammer2016-02-031-0/+10
| | | | | | | | | | | | | | | | | | | | lower_bound does require some additionally operators in order to pass lower_bound static checks. Task-number: QTBUG-50855 Change-Id: I9619770fa9c8ad638d7179d886dfe28fcf4eb3d5 Signed-off-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Make TextureImage DNA more robust to collisions.Wieland Hagen2016-02-041-1/+4
|/ | | | | | Task-number: QTBUG-50076 Change-Id: Iab8cac610bd9e14885d3f583b17b2e7e3a642e2f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Documentation for QQmlAspectEngineMika Salmela2016-01-271-0/+47
| | | | | Change-Id: I656d9d5e6ed5fe2420e2b2ced8193040dfce666f Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Doc: Mark the rest of the private classes \internalTopi Reinio2016-01-269-35/+35
| | | | | | | | | | Private headers are no longer part of the documentation build, so the documentation for these classes triggers a lot of QDoc warnings. Avoid this by replacing the QDoc comment blocks '/*!' with standard C comments. Change-Id: Id7aac9354e12ba2b7a62f84b947a5f6f38702c6d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix documentation macro and other issuesTopi Reinio2016-01-264-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc doesn't allow a macro that expands into an empty string: src/core/nodes/qcomponent.cpp:189: warning: Unknown command '\TODO' Linking issues that are fixed by adding a dependency to Qt GUI: src/input/frontend/qkeyevent.cpp:121: warning: Can't link to 'QKeyEvent::nativeScanCode()' src/input/frontend/qkeyevent.cpp:141: warning: Can't link to 'QKeySequence::StandardKey' src/quick3d/quick3d/qquaternionanimation.cpp:42: warning: Can't link to 'QQuaternion' Other fixed warnings: src/input/frontend/qmousecontroller.cpp:54: warning: Unknown command '\intantiates' src/quick3d/quick3d/qquaternionanimation.cpp:42: warning: C++ class Qt3DCore::Quick::QQuaternionAnimation not found src/render/materialsystem/qparametermapping.cpp:85: warning: Undocumented enum item 'UniformBufferObject' Undocumented enum item 'ShaderStorageBufferObject' examples/qt3d/wireframe/doc/src/wireframe.qdoc:28: warning: Can't link to 'BasicCamera' Change-Id: Iea8f591bd09f0b8895dc568a48f2bfe80f2fe73d Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Doc: Mark QCircularBuffer as \internalTopi Reinio2016-01-251-159/+159
| | | | | | | | | | As the class was made private, mark it \internal. Because its private header file is not included in the documentation build, also replace the qdoc comments '/*!' with standard C comments to avoid documentation warnings. Change-Id: I896d13e4192830976d8f24c5b98fdef2b127bf1c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Exclude private header files from the documentation buildTopi Reinio2016-01-2577-310/+2
| | | | | | | | | | | | In the documentation configuration, exclude all '_p.h' files from the documentation build. This prevents QDoc from generating documentation for private classes, and also allows removal of documentation that explicitly set the private classes \internal. Change-Id: I8fcf5c99a2a0b75e9ee5dcd928fa4a2b4b8cf34f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Use 'Qt 3D' instead of Qt3D consistentlyTopi Reinio2016-01-253-8/+9
| | | | | Change-Id: I91c0d00c0116a05209239da399f4076316a51fc7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add missing Q_DECL_OVERRIDESergio Martins2016-01-231-1/+1
| | | | | Change-Id: I0165fc4b9a08fc1d56f5338f3c67052875342498 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Add skeletal doc structure for the QML types of Qt3D Input moduleVenugopal Shivashankar2016-01-2212-7/+185
| | | | | | | Also marked a few private C++ classes as \internal. Change-Id: I32a7da498c97e132f6b6e60d551cc0b7feb52b01 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Add skeletal doc structure for the Transform QML typeVenugopal Shivashankar2016-01-224-1/+11
| | | | | | | | Also improvised on the \brief statements for other QML types in Qt3D.Core, based on the corresponding C++ class \briefs. Change-Id: I7780e12d9a50a0c0a9b9e83c028f14bd76a237de Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Added Audio Visualizer exampleTitta Heikkala2016-01-221-1/+2
| | | | | | | | | | | | Example visualizes the magnitude of music played as animated bars. The music is played using media player. Implementation combines the use of Qt 3D rendering with Qt Quick 2D elements. Change-Id: I945d50d0dbd26151f274269649cca793a5ad4d27 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Removed Qt3DCollision namespace and module docsVenugopal Shivashankar2016-01-2110-87/+54
| | | | | | | | Besides that, fixed a few qdoc warnings. Change-Id: Ibaf8fd6ffbb93f3f2bd73fa5fedf06e94f6ac2eb Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* GLSL 100 light include uses too many uniformsAndy Nichols2016-01-201-175/+1
| | | | | | | | With the additon of the uniforms for supporting spotlights, now it is only possible to have 2 active lights instead of 4. Change-Id: Ie9d84c85cda204f82f976fb55d8b5fe74ba58687 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Added skeleton docs to geometry classesTomi Korpipää2016-01-2018-12/+1549
| | | | | | | Change-Id: I312b3f1eed1578899319cfc30b9bad143c5c467e Task-number: QTBUG-46037 Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Don't allocate QMutex members on the heap.Volker Krause2016-01-196-21/+13
| | | | | Change-Id: I23f1ccd2f2bbee2fcab2eadfeeec83e1ac489623 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed some documentation warningsTomi Korpipää2016-01-199-19/+16
| | | | | | | Change-Id: I5055043641a1916dde47ad614d8ab7a5788fd93b Task-number: QTBUG-46037 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* Fix resource leaks in ArrayAllocatingPolicy.Volker Krause2016-01-191-18/+43
| | | | | | | | | | | | | | Previously we ended up with default constructed elements in the bucket, and were constructing new ones for every allocation. As some of the types used in here allocate resources in their ctors themselves we were leaking those resources. Now we only construct each element at most once, and we don't construct any element that is never used. The resulting re-use of elements exposed the missing cleanup method in tst_ArrayResource. Change-Id: Ie875fea3ebc9b6f96d0239a6064474fbea798814 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Revert "Fix crash when Scene3DItem is removed from scene"Mauro Persano2016-01-152-34/+32
| | | | | | | | | | This reverts commit 658d7bee705224c9e2fbbab1d5e79d32c99858f7. The problem that this commit tried to fix still exists, but the commit seems to have just replaced a kind of shutdown crash with a different one. Change-Id: Ic34b4da9798269c2ed8b02992c811c2129eb5673 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* centralize + fix use of system assimpOswald Buddenhagen2016-01-143-10/+14
| | | | | | | | | | | | follow the foo.pri & foo_dependency.pri pattern found in qtbase to de-duplicate the code (and thus implicitly make it consistent) and synchronize the conditionals in the configure test. also document why we still can't enable the assimp sceneparser in all configurations. Change-Id: I3bdc30e077b6c9c7027a9311195c08a6c5f1fcf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Make axisIdentifier & buttonIdentifier constBogDan Vatra2016-01-145-10/+10
| | | | | Change-Id: Idedf3cab5d8a30d1a417ceb10555170b53b00d26 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* "cleanup" method needs to be virtual.BogDan Vatra2016-01-121-1/+1
| | | | | Change-Id: I0075adf8b927a29f06be6ab883622b216cca5b44 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove unused ListAllocationPolicy.Volker Krause2016-01-122-74/+0
| | | | | Change-Id: I59a6461fd3e81d578af3cc33248fb21d8b503135 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Android: handle image from assetsBogDan Vatra2016-01-111-1/+5
| | | | | | Task-number: QTBUG-46866 Change-Id: I0f7f8bcb3afe528e9a00270025ed42e950221800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix crash when Scene3DItem is removed from sceneMauro Persano2016-01-112-32/+34
| | | | | | | | | | | | Under certain situations the windowChanged signal was being triggered after the Scene3DItem was already removed from the scene, causing a crash in Scene3DRenderer::render(). Use itemChange() instead to check when the item is removed instead of the windowChanged signal. Change-Id: Ia635081eca213c8d6e3bd4a59aafaa3dcc86d7e3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix race on QAspectManager shutdownMauro Persano2016-01-082-0/+5
| | | | | | | | | | | | | | When QAspectManager::quit() is called, the exec() loop finishes. Then QAspectThread calls shutdown() and deletes the QAspectManager instance. However, in certain cases, the QAspectManager object can be deleted before QAspectThread::quit() has a chance to finish running, causing a crash when it tries to acquire the m_waitForEndOfExec semaphore. Make exec() wait for quit() to prevent this. Change-Id: I579e3e6b5684984ec32497852d94cc050cccbef5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Replace QTextStream with QString::splitRefMauro Persano2016-01-071-38/+52
| | | | | Change-Id: I0a540dfdcbe5f28df38cf406c771c828e25abd64 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use QFuture::waitForFinished directly.Volker Krause2016-01-071-7/+2
| | | | | | | | | | QFutureWatcher::waitForFinished calls the same internally, but adds additional overhead we don't need here. Saves a couple of allocations per frame. Change-Id: I616a527068fd1c55238ca88b2fc753b423116e32 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Avoid unnecessary detaching.Volker Krause2016-01-072-4/+4
| | | | | Change-Id: Ied910d38c400b34a38f6eaea9683107b079513ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix RenderViewJob crash on Renderer shutdownMauro Persano2016-01-071-0/+2
| | | | | | | | | | | | Set Renderer::m_running to zero to prevent crashes when Renderer::shutdown is called while a RenderViewJob is running. This only affects QtQuick/Scene3D. It's not a problem in the case of pure Qt3D, as Renderer::m_running is set to zero when Renderer::setSurface(0) is called before Renderer::shutdown. Change-Id: I41f8da7589c098c6df9d24792932a293df7982aa Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 09:59:03 +0000