summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix black screen when deleting a window containerTomi Korpipaa2019-12-021-4/+2
| | | | | | | | | | | | | When deleting a window container with Q3DBars, or any other visualization type, we ended up with black screen. By calling deleteLater instead of immediate delete for the renderer we can avoid this. Fixes: QTBUG-80168 Change-Id: I6fd5aee5cd26ed1d96aa85b7877160e8996e093a Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Register revision 1 of Q3DSceneUlf Hermann2019-02-251-0/+1
| | | | | | | | | | Without this, properties of Q3DScene added after revision 0 stay unknown to the QML engine. Fixes: QTBUG-74016 Change-Id: I7bec39b5984dce6d5724287a79f23cb1cc86d378 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix mesa checkJoni Poikelin2019-01-221-1/+1
| | | | | | | | VMware virtual machines have "OpenGL ES 3.0 Mesa x.x.x" as the version string. Change-Id: I5c23524a021732e84b78090de2913b4d974e9f34 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Fix \code command usageTopi Reinio2018-10-251-12/+15
| | | | | | | | | Since Qt 5.12, \code command accepts parameters, and in-line usage no longer works (and was never documented to work). Task-number: QTBUG-70980 Change-Id: I010ba21c2a20f70bfdacd7bb0c1aea3836c8efca Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3v5.12.0-beta2Qt Forward Merge Bot2018-09-291-0/+1
|\ | | | | | | Change-Id: I600f4d6094d1934b082ed506f3cde75f13b41cfc
| * Do show module license on all help pagesKai Koehne2018-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Data Visualization has a different main license than most other Qt modules, which is easy to miss. We do show the license on the module landing page and in the 'All modules' overview page, but if you directly open an example or a class page you can still miss this. This change adds the main license description to the header shared by all pages of the module; we (mis)use the buildversion variable for that, which was so far unused. Right now qdoc does not 'linkify' the entry. It could add a generic link to the landing page though, where the license is also described. Task-number: QTBUG-70354 Change-Id: Ic4917541a6480d1cb3879f87e6aac0093dd1f3b3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Update plugins.qmltypesv5.12.0-beta1Kai Koehne2018-09-272-433/+4
| | | | | | | | | | | | | | Task-number: QTBUG-70264 Change-Id: I2742e2c61e0fe6a2566a11d721f0cbd0135c7a00 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-049-99/+81
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I135ec58950ba88e041d19561353e0946f4a51497
| * Use FDL license for all .qdoc filesKai Koehne2018-05-309-99/+81
| | | | | | | | | | Change-Id: I732a95d5adbd7579b05e8cb2b1afd586d5b5bc58 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+6
|\| | | | | | | Change-Id: I06c078868b98c6210bac5ad450122a191eeedef5
| * Doc: Add license information to index pageKai Koehne2018-05-091-0/+6
| | | | | | | | | | | | Change-Id: I0c20e133621f4095df5fc7f53a3e1981d248a93f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I1ad043f9e676deaea30ae022c090f188066a299c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Remove Qt<5.12 workaroundOlivier Goffart2018-04-101-2/+0
| | | | | | | | | | | | | | This change partly reverts commit da3c5925d546282e99f13b450a674c7024fde9ed. Change-Id: Ifd09b63a56d5f2e8837e461ca6048d80fcb8c916 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Use Qt::Alignment instead of the AlignmentFlag enum to represent flagsOlivier Goffart2018-04-105-9/+11
|/ | | | | | | | | | | | | Because from Qt 5.12, the the right operator| is found in the Qt namespace instead of in the global namespace. One must still add the 'using' statement so this patch can be integrated using a previous qtbase. But the statement can be removed once qtbase is updated. Task-number: QTBUG-67582 Change-Id: Ib79c4623e858988bb55a87ad4fb0c1e0ceee81cf Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix wrong license headerv5.11.0-rc2v5.11.0-rc1v5.11.0-beta4v5.11.0-beta3v5.11.0Jani Heikkinen2018-03-281-10/+21
| | | | | | | | | Some old license header were used. replace it with proper one Task-number: QTBUG-67308 Change-Id: I6c501ab381c4ebb9f0b3466c303447edf3531915 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Simon Quigley <tsimonq2@ubuntu.com>
* Remove QDoc-related typedef hacksv5.11.0-beta2Topi Reinio2018-03-086-22/+13
| | | | | | | | | These are now longer required on Qt 5.11 where QDoc uses Clang to parse the documentation. Change-Id: I8a3bd7d935acf4c93fb8a6179cb8d3327697759a Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix documentation build when using Clang-enabled QDocTopi Reinio2018-03-081-0/+5
| | | | | | | | | | | | QDoc in Qt 5.11 uses Clang to parse the C++ documentation. Ignore the custom namespace used for Qt Data Visualization when Clang is used - this resolves all documentation warnings and generates it as it did on Qt 5.10. Change-Id: I331bdb07611eb97f1df1896468d11c9341156739 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-3/+10
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie7a50a1cc66ddffe04933f77323d03941e0d7acd
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-185-3/+10
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
| | * Fix mixing of vec3 and vec2 for coords_mdlMika Salmela2017-12-212-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Vec3 used on fragment shader when vec2 used on vertex shader. On surfaceTextureFlat coords_mdl not used at all, so remove it. Change-Id: I7898db37e7967a7cb9933fe1a05f42a332c06130 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Render custom items at insertion orderMika Salmela2017-11-163-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the rendering order of custom items to insertion order. Task-number: QTBUG-64312 Change-Id: I1ce865a3492c145ffa269cd12baa15ffff8d6a59 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-202-3/+8
|\| | | | | | | | | | | Change-Id: Iea700ac85da7205933622b61e1c43f774c82e45a
| * | Doc: Update the list of highlighted examplesTopi Reinio2017-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Drop highlighting for 'Surface Example' in favor of 'Qt Quick 2 Surface Multiseries Example'. Task-number: QTBUG-60663 Change-Id: I7a8e3c501b7d5eaf500d3e0eca2eb41c17d182d5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-2/+6
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibd0e0140e7055c7819a65e661a96095648de6fcd
| | * Set clamp to edge wrap modes for surface texturesMika Salmela2017-09-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | By default surface textures had wrong wrap modes making the color bleed on edges. This patch changes the texture wrap modes to clamp to edge. Task-number: QTBUG-62996 Change-Id: Iebee66b01a78db6036cb0c833f39237f8e98b6b7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * | Doc: Update the highlighted examples listv5.10.0-beta2Venugopal Shivashankar2017-10-051-1/+2
| | | | | | | | | | | | | | | Change-Id: Ied7eec2b6646d079ca2838f1b69d6626017818df Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-2633-67/+67
|/ / | | | | | | | | Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-151-1/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I849ed97b46cf390fd6c5d3017b7e66f7dd9aeeef
| * Use QSharedPointer::create() moreMarc Mutz2017-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | This is the result of running the (experimental) clang-tidy check qt-modernize-qsharedpointer-create Discarded changes: none. Change-Id: Id131553710a846ff131abbc7fd7c01cc5b1da1df Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Reduce the scope of the preprocessor branches with the help of a unionJake Petroules2017-08-092-60/+30
| | | | | | | | | | | | | | Change-Id: I195589565920e795cdae99f837b51917b3831228 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Use qRadiansToDegrees() and qDegreesToRadians() more widelyEdward Welbourne2017-06-142-2/+2
|/ | | | | | | | | These document what the arithmetic is actually doing; and save us an ad-hoc use of an approximate value for pi while we're about it. Task-number: QTBUG-58083 Change-Id: I82c5502af724b33ec598c5a9da76537f93a95eac Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Position the break statement in the proper placeThiago Macieira2017-06-051-1/+1
| | | | | | | | That is, AFTER the statement of the case label. Alternatively speaking, resolve dead code problem. Change-Id: Ia3e896da908f42939148fffd14c480ca73c1be4b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Highlight bars examplev5.9.0-rc2v5.9.0-rc1v5.9.0Miikka Heikkinen2017-05-171-0/+2
| | | | | Change-Id: Ic152a0ce98d1feefe81a585b0086fd971ebe62ed Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix bundling of module for static buildsJulian Strobl2017-05-051-0/+8
| | | | | | | | | | | | | | Without this patch the module is not bundled in static builds correctly causing 'module "<QtModule>" is not installed' errors in during runtime. As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)' at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false', which indicates that the module was not registered. Task-number: QTBUG-59559 Change-Id: I37003c4305fbe499c9911ff2aefa35deab832bdf Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix build for -no-feature-wheeleventStephan Binner2017-04-2410-0/+20
| | | | | Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit custom item, label, and volume docs for grammar and stylev5.9.0-beta3v5.9.0-beta2Leena Miettinen2017-04-073-114/+145
| | | | | Change-Id: I2b5a546c5035cbf304db57d3e18c998421969392 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit data item docs for grammar and styleLeena Miettinen2017-04-073-44/+47
| | | | | Change-Id: Ic93eb2648bdff84e88acdf7941ddd85cc6d874ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit data proxy documentation for grammar and styleLeena Miettinen2017-04-074-195/+249
| | | | | Change-Id: Ibf26f40e53e8dab3cea717c6ca55e2568cb747e1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix warning about member initialization out of orderThiago Macieira2017-04-031-1/+1
| | | | | | | | | | | Instead of fixing the order in the constructor, let's fix the order of the declarations to follow the rule of thumb to avoid padding holes. q3dlight.cpp:107:5: warning: field 'q_ptr' will be initialized after field 'm_automaticLight' [-Wreorder] Change-Id: I27b55fdf514247549455fffd14b17abe78cbad28 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit the series docs for grammar and stylev5.9.0-beta1Leena Miettinen2017-03-274-115/+133
| | | | | Change-Id: I9b03e4e3cf600fa68a4d7f0372b0fba676affb65 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit the axes documentation for grammar and styleLeena Miettinen2017-03-245-135/+157
| | | | | Change-Id: I2109585660af7cfcae2cfd779ebfc67d341a09f5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add an overview of data visualizationLeena Miettinen2017-03-213-35/+279
| | | | | | | | | Move some information from the front page and the known issues to the overview. Add some information to the interacting with data topic. Change-Id: Ia63e1d46ec48861a144c51f0d8796809ea771ea4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc error by using #ifndef Q_QDOC to omit unused functionLeena Miettinen2017-03-172-2/+4
| | | | | | | | Also fix the function signature in the qdoc file. Change-Id: If8a7cb83f94efb9a5a999c99fce722e4ffb96312 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable transparency for wallsMika Salmela2017-03-103-48/+106
| | | | | | | | | | When alpha value for wall is below 1.0, enable blending for walls. Rearrange code so that solid objects are drawn first and then possible tranparent objects. Task-number: QTBUG-59140 Change-Id: I5087a664a59ecdb4516b17e8fac1f8ff48ad1c16 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Remove installation and build informationLeena Miettinen2017-03-032-118/+6
| | | | | | | | Qt Data Visualization is now a standard Qt module that can be installed and built as any other module. Change-Id: Idb7e05304e159c30614d728529261d3ec2ea6002 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docsLeena Miettinen2017-03-031-119/+258
| | | | | Change-Id: I21c74d848088bdbf1ddfc4339deede65eb750c6f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return commands (Q3dSurface)Leena Miettinen2017-03-022-38/+52
| | | | | | | | Remove property getter docs, because they do not add any info, and move setter docs to separate entries. Change-Id: I78a0dab0ec9652b58b319f09dc5266e36d12e85a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (Q3dCamera)Leena Miettinen2017-03-021-54/+63
| | | | | Change-Id: If73980ebc6b34ebae2c362f90837e62910477d37 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (QItemModelBarDataProxy)Leena Miettinen2017-03-021-38/+64
| | | | | | | | | - Use \list command for lists - Add \brief commands for property docs - Replace \returns with "returns" Change-Id: I7930a9dd9ce87c61e8381a5e2c4f42c7bf0ae75a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (Q3dInputHandler)Leena Miettinen2017-03-021-8/+12
| | | | | Change-Id: Ie133649df4efb6c3acb7bdb3adcc311822aae590 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 06:49:59 +0000