summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | 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>
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ / | | | | | | Change-Id: I981a04de082d1d8e80a7fdd7ac1e30156734a555
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-152-1/+25
|\| | | | | | | | | | | | | 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>
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I2b9f8d5887205f1962b29d2b2a1e649662e77a27
| * Add changes file for 5.9.1v5.9.1Antti Kokko2017-06-231-0/+24
| | | | | | | | | | | | Change-Id: Idbc072028735655ac19281fa818bfd17075b56c7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Enable tests for boot2qtSami Nurmenniemi2017-08-1118-12/+91
| | | | | | | | | | | | | | | | | | | | | | | | The tests for boot2qt were disabled with commit 0340120d5f7940c9aebfd0f60328805227f8824d. Some of them can now be enabled since qtdeclarative fallbacks to software renderer if OpenGL is not supported. Some tests still need to be skipped if OpenGL is not supported. Task-number: QTBUG-60268 Change-Id: I8019859bc88497e08599d0b5f4981b9a3ac071f3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@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 QRandomGenerator instead of q?randThiago Macieira2017-07-0410-74/+91
| | | | | | | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Use qRadiansToDegrees() and qDegreesToRadians() more widelyEdward Welbourne2017-06-145-13/+10
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0716-1/+62
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I363b4779fe630b7956f6582ac3821d4ea8ee34c8
| * 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>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+2
| |\ | | | | | | | | | Change-Id: I3775af6323e192ab6473c50e5db90ae1237126d9
| | * 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>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| |/ | | | | | | Change-Id: I98dfc9c2551700c161dc07a0a93d6c77b681b300
| * Update changes file for 5.9.0v5.9.0-beta4Antti Kokko2017-05-051-0/+17
| | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: Ic6f304b054d6b8ae349faf0b5c2ee0df2da1e314 Reviewed-by: Tomi Korpipää <tomi.korpipaa@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>
| * Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-04-282-0/+14
| | | | | | | | | | | | | | | | | | Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ic6494b8a17d4bd277f04472bea9d83cb20bc3805 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix build for -no-feature-wheeleventStephan Binner2017-04-2410-0/+20
| | | | | | | | | | Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-2146-1506/+2232
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibb41c2bb83df7e02696e27afe62e94ed059284ae
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:46:49 +0000