summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.1' in qt/qtdatavis3dv6.5.16.5.1Qt Submodule Update Bot2023-05-161-3/+3
| | | | | Change-Id: Iec003a59acbd39741db91617a7698b76a1192b5f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtdatavis3dQt Submodule Update Bot2023-05-161-1/+1
| | | | | Change-Id: I2f55c5d85ab99335f5e98f75863a004e22a72802 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtdatavis3dQt Submodule Update Bot2023-05-151-3/+3
| | | | | Change-Id: I11c87a35da01834e030fa1de4f8897df8f935ed0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtdatavis3dQt Submodule Update Bot2023-05-111-3/+3
| | | | | Change-Id: I02cf44b4a934f481017bdb7835f55f179cd9257f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtdatavis3dQt Submodule Update Bot2023-05-051-3/+3
| | | | | Change-Id: Iaec79b5d398d1dc60e0c4a2a37d28ad67ea81f64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-05-011-3/+3
| | | | | Change-Id: I8dc76c29f646c2b35ce328c2dc4489a2e846f4d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-04-281-3/+3
| | | | | Change-Id: I9b434e326c4fb0321a746ed6619af96a3ee35909 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-04-261-3/+3
| | | | | Change-Id: If9998be7b80bf4c5400919579929ef81e620de5d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Resolve a duplicate symbol issueAmir Masoud Abdol2023-04-212-1/+2
| | | | | | | | | | | | On unity build, `itemScaler` is defined in `scatter3drenderer.cpp` as well, and causes a symbol redefinition error. By making this one a static member, we can avoid it. Task-number: QTBUG-109394 Change-Id: Iba5b27a9e066de4c4502b30f5c265770bf991649 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 247f236440d0aa7e81a90150d9b8867e0de0a539) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-04-201-3/+3
| | | | | Change-Id: I5912d3fec49b53e2271a0c8a8a2e839f69f02468 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-04-191-3/+3
| | | | | Change-Id: I9d1712f6a41b83f50143269772752530d72772e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix invalid value handlingTomi Korpipaa2023-04-1912-115/+144
| | | | | | | | Fixes: QTBUG-112773 Change-Id: I3b00587d27e88dd69b58efe3551abf8759df0020 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 86665d774ec0e4efb46eec47fdc8297a3ff5d196) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude a few source files from unity buildAmir Masoud Abdol2023-04-181-0/+11
| | | | | | | | | | | | | MinGW triggers `-Werror=maybe-uninitialized` while proper checks are in place and d_ptr is initialized in operator=(). The copy constructor can probably be implemented differently, but for now, excluding the files allows us to continue testing the unity build. Task-number: QTBUG-109394 Change-Id: Ibb2a101a4fe5a6833903a28887077f0bde5573f8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 53fbc4956079deafd1920d8b9a3c6a1228fac69f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-04-181-3/+3
| | | | | Change-Id: I0b368a4ccae18fa9a5c95873af128f2ff37e2f12 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove dependency on Qml target for the non-qml moduleAlexandru Croitor2023-04-172-4/+1
| | | | | | | | | Fixes: QTBUG-112813 Change-Id: Ib8d479278657b0741e5e325821c6f1432725005e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 63b27b664ea8a41420723e053830412068c6eefe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-04-131-3/+3
| | | | | Change-Id: I75305fb535ffe5fc87abb6289befab23bcbcb7f5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-04-121-3/+3
| | | | | Change-Id: I9269a241e87847b4c39c546907ea77fa73a07b7b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Use the \examplecategory macro to tag examplesTopi Reinio2023-04-116-6/+6
| | | | | | | | | | | | | | | | | The '\meta category' command was used for tagging examples with a specific category, used in Qt Creators Welcome mode. As we want to also generate lists of examples belonging to a category elsewhere in the documentation, replace the command with a macro that expands to the original \meta command and also adds the example to a group using the \ingroup command. This way, the category names can be used as arguments to the \generatelist or \annotatedlist commands. Task-number: QTBUG-112731 Change-Id: Ibfd1179923b898259a5c96417aba8f7711e9c5ee Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 6c7984e6931fa7123c1faee8a8c91d159d293633) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.5.1Jani Heikkinen2023-04-041-1/+1
| | | | | Change-Id: Id888c02079a440c39dcf1e12094c9dfa60db29ad Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-04-041-3/+3
| | | | | Change-Id: Iff45aac22ea2d973bb16cd0053effb625a97b488 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix compilation of a manual testTomi Korpipaa2023-03-291-14/+0
| | | | | | | | Change-Id: I563a604cb80ab2a605bec60064e5b5bd4d8b1271 Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 28d3ed4edf81ab9436b0cd0dd0bc84edde11f1c1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-03-221-3/+3
| | | | | Change-Id: I06f27a027930715b1223b9856d1fdd0c38cb7e9c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-03-201-3/+3
| | | | | Change-Id: I7a96e64df4e681956daf1ba373178806dad301d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Brush up the qmlsurfacegallery exampleFriedemann Kleint2023-03-163-30/+28
| | | | | | | | | | | | - Use modern string literals - Use member initialization - Streamline the code a bit with algorithms Task-number: QTBUG-110700 Change-Id: Iad834c22f4dc14858b0f5da4fc2a550de9906072 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit acdaea0c859ba7b78756011ea60ec2765b5a8f04) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the example licensesFriedemann Kleint2023-03-1654-54/+54
| | | | | | | | | Examples are BSD licensed Change-Id: Ib2136fd1e09c0cb366b224558b36ab6808cf7b8e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit aaf72bd938c4aacb92a6a6f726c30b856e1158ac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-03-111-3/+3
| | | | | Change-Id: Ide5d1257551f5010b0ad90f7dde6ecce0810a58b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* graphgallery example: Factor out pixmap drawing functions from ↵Friedemann Kleint2023-03-091-48/+66
| | | | | | | | | | | SurfaceGraph::initialize() The function is already quite big. Task-number: QTBUG-110698 Change-Id: I7e31b64064595a700365d3b1654705924a36052e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit ef20d4baa2abaa010f2e07577fb586fdb1126834)
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-03-081-3/+3
| | | | | Change-Id: If287717a064b6cbbdccaf027e0876c7e5ced9b60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-03-061-3/+3
| | | | | Change-Id: I58377164d8d911c772f5bf36f0b532ff254516e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* graphgallery example: Streamline the code a bitFriedemann Kleint2023-03-036-47/+44
| | | | | | | | | | | | | - Populate the data rows using reserve()/append() instead of resize() / assign. - Use prefix increment - Use QStringView when splitting the data file lines Task-number: QTBUG-110698 Change-Id: I70fed07a9850e2636e6085b9a9190f1e5a062a67 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit ed80c940b659455e2bd98700157f5fc78a17b41c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* graphgallery example: Rearrange initializationFriedemann Kleint2023-03-037-46/+33
| | | | | | | | | | | Calculate the sizes in main and pass them to the graph initialization functions. Also display the message box for GL errors in main. Task-number: QTBUG-110698 Change-Id: I622311220e6ff63980b59778bfe9bb56922e6149 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 1bfc0919b8ddb0f1576b6f7ad20a72dc5d23f3e4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-03-021-3/+3
| | | | | Change-Id: If1bab65f0b00f73a53c5d4d187cc4859bc839f25 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* graphgallery example: Fix leaking modifier classesFriedemann Kleint2023-03-029-24/+14
| | | | | | | | | | | | The modifier classes were leaking. Pass a parent to ensure their destruction. Remove the deletion of the graphs from their destructors since they are QWindows, which are deleted by QtGui. Task-number: QTBUG-110698 Change-Id: Ied32dad62c93b730f63fa95994c4fc281254c800 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit f289b0b14d174d7c891a225c4e81f67573d8c555) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* graphgallery example: Remove unused methods of the bar data classesFriedemann Kleint2023-03-024-41/+4
| | | | | | | | | Task-number: QTBUG-110698 Change-Id: If591959267680d5599be5d53793ad4ce6c38b632 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 75e6c7570478442324267a9ea5681571e807e356) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix bugs introduced by string literal fixTomi Korpipaa2023-03-011-5/+5
| | | | | | | | | | Some text bugs were introduced in SHA 9c7c6e657ab848f5c252aa780a18e58ead3ee2f8 Change-Id: If95f312fa5fb026270ac4aa637561acec2958b00 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 84fad995f43b98b5bd982bd674eb41f6012a5b92) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-03-011-3/+3
| | | | | Change-Id: I0d2db4b8f7749f3fd370597eb910636b2b572aef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* graphgallery example: Do not cast enum values to int in combo item dataFriedemann Kleint2023-03-014-12/+12
| | | | | | | | | | | Enumerations are now known to the meta type system, no casts are required. Task-number: QTBUG-110698 Change-Id: I02398a5318547b798f9c95f8ed834443b46a58c5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit a4358dabd997e11f7bcd2e4a9437ffaff2a0d46c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* graphgallery example: Create the window containers with a parentFriedemann Kleint2023-02-284-30/+24
| | | | | | | | | | | This avoids the QWindow being created as a top level window with a frame. Task-number: QTBUG-110698 Change-Id: I0a1116f833dd61c43a113c0e7a74a5181c1ee9b9 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 5f31212791b4a044e2a0b62bb66b7d07c2494402) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use new string literals in graphgallery exampleFriedemann Kleint2023-02-289-151/+169
| | | | | | | | | Task-number: QTBUG-110698 Change-Id: I110c297d08f6a24e402e514f36688b5bf4896c59 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 9c7c6e657ab848f5c252aa780a18e58ead3ee2f8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Brush up the graphgallery exampleFriedemann Kleint2023-02-2815-67/+57
| | | | | | | | | | | | | | | | | | | | | - Basic C++ polishing: - Use nullptr - Use initializer lists - Replace typedef by using - Port to qsizetype - Default functions - Fix up copy constructor and assignent - Instantiate the main widget, BarGraph and ScatterGraph on the stack for proper clean up Amends 00272ac80843d94217e4f1ea36392e22919afa22. Task-number: QTBUG-110698 Change-Id: Ibb9e3ecf5e20ebaaeac2483c768d7b5eb00c0558 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 5f98f32634dc49feaed12d4798838e2da9f28194) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Combine 3 more widget examples into graph galleryTomi Korpipaa2023-02-2752-1841/+1501
| | | | | | | | | | | Combine the remaining 3 surface graph examples into graph gallery example. Task-number: QTBUG-110698 Change-Id: Ia324189e10f781f9822db220def72b7b15d37a49 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 279ed99a5f1fe06c250cec197609e819ea28a38f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Combine 2 more widget examples into graph galleryTomi Korpipaa2023-02-2727-789/+348
| | | | | | | | | | | | Combine the 2 scatter graph examples into graph gallery example. Note: surface examples will be combined into graph gallery in other commits, to avoid making one gigantic commit. Task-number: QTBUG-110698 Change-Id: I8c50d07a31a8b1ee84596f4e216e629d88c7846a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit cbaa2eaaf73ffa0d2b4ba999c993199fc22110ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-02-241-3/+3
| | | | | Change-Id: Ia41b4b92b1eee8bd87621b1fa637400d639ce3b0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Combine 2 widget examples into graph galleryTomi Korpipaa2023-02-2329-847/+832
| | | | | | | | | | | | Combine the 2 bar graph examples into graph gallery example. Note: surface and scatter examples will be combined into graph gallery in other commits, to avoid making one gigantic commit. Task-number: QTBUG-110698 Change-Id: Iadf32e4e4d13c06325c89cf9259393d0b9fbda0e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 00272ac80843d94217e4f1ea36392e22919afa22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the compilation of manual testsTomi Korpipaa2023-02-211-6/+0
| | | | | | | | Change-Id: Ia5e29acec4e51e09210f5bcfd0cbfd054cf58b1b Reviewed-by: Dilek Akcay <dilek.akcay@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 283f14682002bef302f64eb9ac93ce9573107826) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dv6.5.0-beta3Qt Submodule Update Bot2023-02-171-3/+3
| | | | | Change-Id: I1df737e079cc9b7085b0f1c4ca236b26eeb8a794 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove QT_DECL_METATYPE from examplesFriedemann Kleint2023-02-131-2/+0
| | | | | | | | | | | | | They cause conflicts in CMake Unity (Jumbo) builds and are reportedly unnecessary. See https://lists.qt-project.org/pipermail/development/2022-July/042744.html Task-number: QTBUG-109394 Change-Id: Ic031710227dbffe23900fb3ad6d3667aa23fd2fe Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 0188992d19aad1d2f10950a0042c761368cdf8f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-136-12/+8
| | | | | | | | | | | Disambiguate a few static constants. Task-number: QTBUG-109394 Change-Id: I6cd2cf3af13b1122ead5ec42b655eb52cdbd2cea Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> (cherry picked from commit ac3fa51e5f3598b291fa805f173c5fa2209b5128) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revamp volumetric example visuals and documentationTomi Korpipaa2023-02-135-173/+143
| | | | | | | | | Fixes: QTBUG-110907 Change-Id: I16fa89d742ac7a7f26bb040e12c6f1e55a10f293 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit b4cb821c1e0059eb37176d5534b74914f4ef2a3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtdatavis3dQt Submodule Update Bot2023-02-101-3/+3
| | | | | Change-Id: I8d42ae117d0eacabdbb689fa2a81e36fd7be95b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 08:17:57 +0000