summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.6Oswald Buddenhagen2017-09-211-1/+1
| | | | Change-Id: I4347b8a17566575ebaa2f6d9b1fdfd7c392d1a0f
* Bump versionv5.6.3Oswald Buddenhagen2016-11-281-1/+1
| | | | Change-Id: I0bec2dbcee58da91970c845c22b611018720aa52
* 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>
* QFixedFrameAllocator: Extract Method scan()Marc Mutz2016-10-242-17/+25
| | | | | | | | | | | | | | | | | The old code used indices to detect when it fell off the end of m_chunks and needed to allocate a new chunk, but this was opaque to Coverity, which saw the potential for m_lastAllocatedChunk == nullptr at the end of the function, and thus reported a nullptr deref there. Fix by moving the scanning of m_chunks into a new method, scan(), which more clearly communicates that it never returns nullptr, not least because it returns by reference instead of pointer. Coverity-Id: 154279 Change-Id: I0cfe8fd819bbfc5b03a98b5e9354c0e98a521d34 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QRenderAspect: remove misleading checkMarc Mutz2016-10-241-1/+1
| | | | | | | | | | | | | | | | The check of d->m_renderer against nullptr follows an unconditional deref of the same pointer with no intervening code. It must therefore be always true. Remove it. That done, m_renderer _is_ nullptr after the ctor ran, and before the dtor runs (there's a check), so maybe the code should at least assert the existence of m_renderer before using it. Coverity-Id: 156307 Change-Id: Iacf2c09db1c0a5a55a67cfb6ef2a00652e557d09 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge fix for tst_renderqueue::concurrentQueueAccess autotest to 5.6Milla Pohjanheimo2016-10-191-14/+7
| | | | | | | | | | The test is failing in 5.6 also. Same as e8a691192d5646924453cd1c617eae1b3d2a93aa Task-number: QTBUG-53915 Change-Id: I8075c65abc96536c3fafad912c07b73aa6e0b2d7 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* GLTFIO: check return value of QFile::open()Marc Mutz2016-10-051-6/+4
| | | | | | | | | | | We checked that the file exists prior to opening it, but it could still be unreadable (due to permissions, e.g.), so check with QFile::open() and emit QFile::errorString() in case it goes wrong. Coverity-Id: 161328 Change-Id: I3489488023bb697d6cb9eee6be07c0edd923c478 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* remove pointless load(qt_build_paths)Oswald Buddenhagen2016-10-041-1/+0
| | | | | | | | | | | all .prf files that need the variables it sets actually load it by themselves. This reverts commit 3ec11e4d94d57678f4dd1162185beef62e43da12. Change-Id: Ia662f252b8215f83e090391748947a8579566885 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Change instances of 'OS X' to 'macOS'v5.6.2Topi Reinio2016-08-121-1/+1
| | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I0a7da987b0322b622a34f6735210bfdf708479ab Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Replace “#define private public” with a proper friend class declarationDmitry Shachnev2016-06-202-4/+3
| | | | | | Change-Id: I98a31d165367e725c902df368c9c2824439a47d6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make QHandle tests pass on big endian systemsDmitry Shachnev2016-06-201-8/+14
| | | | | | | | | | | | | | | QHandle uses an union internally so the value of handle is composed of values of three other integer fields, as defined in Data structure. The value is different on big endian and little endian systems. This commit introduces a new GET_EXPECTED_HANDLE macro which determines what the handle should be equal to based on values of those integer fields and the system endianness. Note that the values of those fields are verified too in the tests. Change-Id: I1f1e37a7469995879ff94e8fc2d6b974c1d4359b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-193-3/+3
| | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I233e76eaa660e95099fdec23583984e544a80ac8 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* MouseEventFilter: handle HoverMove eventsPaul Lemire2016-06-071-0/+8
| | | | | | | | | | | When using Scene3D, there are no MouseMove events. Instead there are HoverMove events being generated. For that reason we intercept these to allow the MouseHandlers to receive positionChanged events when used with Scene3D Change-Id: I638a86a1b574e3f99163e0b1b13cb47c83acdc1e Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit dd2710011fd1cf840de0ab194bf74ca65f112221) Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-191-1/+1
|\ | | | | | | Change-Id: I4d597a4948d28855395df5aff179c2f77a060bd5
| * 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>
* | Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | Change-Id: Ia76d564ef3c8bb2153bbfb27edbbd4490242206f
* | Temporarily remove use of a custom allocator for QNodePropertyChanges.Fredrik Orderud2016-05-173-39/+0
|/ | | | | | | | | | | | | Backport of 9927e58063c7bfcb7fedf4f0e01a672dd6ff6b24 from 5.7 branch. Might be related to QTBUG-50704. The custom operators also need improving so that we can use QSharedPointer::create() with them. Once the change refactorings are complete we can look at re-adding the use of the allocator to all change types not just QNodePropertyChange. Task-number: QTBUG-50704 Task-number: QTBUG-51494 Change-Id: Ifd357fecf0e5f58b7198ff526a9dcf9f43e20fa5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* make use of COPIESOswald Buddenhagen2016-05-101-15/+6
| | | | | Change-Id: I7106026af6096871368a9e05df94c907e39cdde1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* 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>
* fix example installsOswald Buddenhagen2016-04-281-0/+4
| | | | | Change-Id: Ib5819aa0f90bbb418fce29ff91a29969fd69c682 Reviewed-by: Paul Lemire <paul.lemire@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>
* Fix macro that broke the build.Rafael Roquetto2016-03-301-2/+1
| | | | | | | | And remove Q_OS_BLACKBERRY, it no longer exists. Change-Id: Iad6d2faa5d9a3c13850d5699cc43caf197781473 Reviewed-by: Volker Krause <volker.krause@kdab.com> 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>
* Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-228-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I78ae38f83ec7e5ad8da41de4eefc12d1df6ebfc0 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-215-14/+15
|\ | | | | | | | | | | | | 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>
| * Fix build in C++98 mode: template typenames must not be localThiago Macieira2016-03-031-6/+8
| | | | | | | | | | | | | | qgltf.cpp:1990:38: error: template argument for ‘template<class Key, class T> class QHash’ uses local type ‘GltfExporter::exportTechniques(QJsonObject&, const QString&)::ProgramNames’ Change-Id: Ic747cc2ab45e4dc6bb70ffff143844dc7120e571 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Android: Fix compilationBogDan Vatra2016-03-171-5/+6
| | | | | | | | | | Change-Id: Iba7c70d47460777f6a503c34736bce9a7e6b300b Reviewed-by: Andy Nichols <andy.nichols@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>
* | Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | Change-Id: Ib2e084214422c18e5a0e93a5ae8abae949c1145d
* | 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-265-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Fixed typo from documentationTitta Heikkala2016-01-251-1/+1
| | | | | Change-Id: Id88f042e3d411df0b7298b3fdff75a49e48150e2 Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 05:53:53 +0000