summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.11Kari Oikarinen2018-12-121-1/+1
| | | | Change-Id: I44d4bd8e0b34e733b552c28f1b05196d0532848e
* Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
|\ | | | | | | Change-Id: I93ebbaae4e91ebb8b0c3dd2361866e72111a6c54
| * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-191-0/+20
|/ | | | | | | | + 191ef6d87362a5285d34ece4c48655408b2daa12 Do show module license on all help pages + 7b091d13ed5509a73da921a7ed30034a7eb55131 Bump version Change-Id: I93bc890a6158e3378a38ffc72a7f7a2ee9d8770d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | Change-Id: I361758adeb173a8c2f6f15057d9db548015bb382
* 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>
* Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
|\ | | | | | | Change-Id: I345d0637c46a80d6bd2054eef7107b8909026bca
| * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
|/ | | | | Change-Id: Iebebaf25141b2bf50352eb2455500ae1f18ec499 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | Change-Id: Id4a42078d6aab155a599200af01629ab59969675
* Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
|\ | | | | | | Change-Id: Ic1f178389975b730da51ff317ed0ef64348c0483
| * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-111-0/+24
| | | | | | | | | | Change-Id: Ib5df75f2d80dd7ad6e5848295b3557b23c398648 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Doc: Add missing dots (qtdatavis3d)Paul Wicking2018-06-192-2/+2
|/ | | | | | Task-number: QTBUG-68933 Change-Id: I4947e5906049cadcd2aefd7dfb7aee25fea7a778 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+24
| | | | | | Change-Id: I85cb2874e7896f2f84e20eccc16a7ad457ce35ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit f95fc1d0592502285613729816632710c4a265ee)
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: Ic672091dd6628af4e0abb3702e27ac8cd22b7115
* Use FDL license for all .qdoc filesKai Koehne2018-05-3032-352/+288
| | | | | Change-Id: I732a95d5adbd7579b05e8cb2b1afd586d5b5bc58 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* 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>
* itemmodel example: Remove unused member variablesFriedemann Kleint2018-05-091-6/+0
| | | | | | | | | | | | Fix Clang warnings main.cpp(74,13): warning: private field 'm_styleTimer' is not used [-Wunused-private-field] main.cpp(75,13): warning: private field 'm_presetTimer' is not used [-Wunused-private-field] main.cpp(76,13): warning: private field 'm_themeTimer' is not used [-Wunused-private-field] Task-number: QTBUG-63512 Change-Id: I618b0b6e6157b8a82af7e81b178f5156cf9c1bca Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@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.9' into 5.11v5.11.0-beta1Liang Qi2018-02-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id472b54f56aa0e58095c50f896e3cb44c6124cd9
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: I0472458c2d3acca239c8d0b076792775b5695a7b
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
|\ \ | | | | | | | | | Change-Id: Ie385d52f1f490cbfa76ea2385862455f12f4fed7
| * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | Change-Id: Ied0acb882d58707ff0bedb2e8fd06f7e554ed8ff Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-125-0/+7
|\| | | | | | | | | | | Change-Id: Ic7d85aece55a90a0fed7ee62a03b1203bbba65fd
| * | qtlite: Skip building examples when configured with no-feature-itemviews5.10Rainer Keller2018-01-265-0/+7
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-53141 Change-Id: I2e9fa0a5b72d79acc22c779e68a3dbe6a320a32a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-209-6/+61
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie7a50a1cc66ddffe04933f77323d03941e0d7acd
| * | Remove unneeded includeRainer Keller2018-01-191-1/+0
| | | | | | | | | | | | | | | Change-Id: I508fc0322f473a476f8943d4171f2242697519fa Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-187-5/+37
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: Ibc5db332babec46a503f19b496391a9100caecef
| | | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-171-0/+25
| | |/ | | | | | | | | | | | | Change-Id: I887a82b73b10d0b559651c9cfb0bd81d9a4b816b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| | * 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>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I8eeeed3dca94f94e39350ac62325279c20a9a728
| | * If not m_resetArray then create itMika Salmela2017-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix m_resetArray so that if it not yet created, then create it. Currently it is created every time. Change-Id: I850bd9d2f719cd76bfd3292a439f9585a4e99fc3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I9255375f69a1b294da4fba89ba390808f47236e2
| | * | 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>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I478999dcb4670fe49802f108dbb7f102024e93fa
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I4d617d8737910076e35e8a59e2aad07a1cf0a1a9
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
| |/| | | | | | |/ | | |/| | | | | Change-Id: I117a04d48ccce0c1319d66d6ced9391e7242cd87
| | * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-081-0/+24
| | |/ | | | | | | | | | | | | Change-Id: I1f2db77065efd4b6509dce8cb1af827ed764e702 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2017-78/+136
|\| | | | | | | | | | | 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>
| * | Add changes file for Qt 5.10.0Jani Heikkinen2017-11-081-0/+22
| | | | | | | | | | | | | | | Change-Id: I3e552a83fe8ea72079e3d7dc503db3a7888cebdd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * | Fix build: pow() is in math.hv5.10.0-beta4Thiago Macieira2017-11-051-0/+1
| | | | | | | | | | | | | | | Change-Id: Icaa86fc7b54d4b368c0efffd14f0b2721e74f854 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | Update to new QRandomGenerator APIThiago Macieira2017-11-0310-75/+75
| | | | | | | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-303-2/+35
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibd0e0140e7055c7819a65e661a96095648de6fcd
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: I86340fbce9be0da41b0de395892222420bb107d3
| | * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-251-0/+26
| | | | | | | | | | | | | | | Change-Id: I408eb3e0f9dc997dec0dc0c9a780857435def96d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| | * Add change file for Qt 5.6.3 (qtdatavis3d 1.2.3)Jani Heikkinen2017-09-061-0/+3
| | | | | | | | | | | | | | | Change-Id: Ic5e9448f5050f3ea42a4fddbc1f9ff2407144a4c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * 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>
| * | Fix build: this example uses exceptions for some reasonv5.10.0-beta3Thiago Macieira2017-10-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | cumulativedistributor.cpp:128:44: error: exception handling disabled, use -fexceptions to enable throw std::runtime_error("out of range"); Change-Id: Icaa86fc7b54d4b368c0efffd14f0b2b6258fe6f5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>