Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-03-12 | 69 | -0/+5607 |
|\ | |||||
| * | CMake: Regenerate and adapt to merge from devwip/cmake | Alexandru Croitor | 2020-03-12 | 4 | -3/+19 |
| * | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2020-03-12 | 134 | -475/+1673 |
| |\ | |||||
| * | | Regenerate qtdeclarative | Alexandru Croitor | 2020-02-12 | 1 | -5/+2 |
| * | | Post-merge fixes | Alexandru Croitor | 2020-01-30 | 1 | -0/+4 |
| * | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2020-01-29 | 20 | -23/+98 |
| |\ \ | |||||
| * | | | Regenerate examples | Alexandru Croitor | 2020-01-29 | 19 | -1/+139 |
| * | | | Post merge fixes | Leander Beernaert | 2020-01-24 | 8 | -21/+23 |
| * | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Leander Beernaert | 2020-01-16 | 94 | -880/+1805 |
| |\ \ \ | |||||
| * | | | | Rename example target to avoid conflicts in super build | Leander Beernaert | 2019-12-17 | 2 | -4/+5 |
| * | | | | Post Merge Fixes | Leander Beernaert | 2019-11-25 | 1 | -2/+2 |
| * | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Leander Beernaert | 2019-11-25 | 19 | -95/+340 |
| |\ \ \ \ | |||||
| * | | | | | cmake: Add missing examples | Frederik Gladhorn | 2019-11-06 | 2 | -0/+100 |
| * | | | | | Regenerate required projects after dev -> wip/cmake merge | Alexandru Croitor | 2019-10-14 | 4 | -24/+40 |
| * | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-10-14 | 79 | -154/+2115 |
| |\ \ \ \ \ | |||||
| * | | | | | | Regenerate Examples | Leander Beernaert | 2019-10-14 | 53 | -113/+126 |
| * | | | | | | Regenerate the necessary bits of qtdeclarative after wip/qt6 merge | Alexandru Croitor | 2019-10-14 | 2 | -2/+30 |
| * | | | | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-10-11 | 27 | -39/+1114 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Update Examples with lowercase qt6_add_resources() | Leander Beernaert | 2019-09-20 | 51 | -77/+77 |
| * | | | | | | | Add missing Examples with qml plugins | Leander Beernaert | 2019-09-19 | 4 | -5/+345 |
| * | | | | | | | Add qt6_add_qml_module() public API | Leander Beernaert | 2019-09-19 | 5 | -9/+59 |
| * | | | | | | | Convert Examples | Leander Beernaert | 2019-08-23 | 61 | -0/+4902 |
* | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-03-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Add missing QPainterPath include in rendernode example | Ulf Hermann | 2020-03-10 | 1 | -0/+1 |
* | | | | | | | | vulkan examples: fix missing include | Fabian Kosmale | 2020-03-09 | 2 | -0/+2 |
* | | | | | | | | fix duplicated properties resulting from bad merge | Fabian Kosmale | 2020-03-09 | 1 | -3/+0 |
* | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-03-09 | 45 | -0/+973 |
|\| | | | | | | | |||||
| * | | | | | | | Examples: Add *.pro projects for existing *.qmlproject | Assam Boudjelthia | 2020-03-04 | 43 | -0/+971 |
| * | | | | | | | Examples: enable HighDPI scaling for Android | Assam Boudjelthia | 2020-02-24 | 2 | -0/+2 |
* | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-02-19 | 1 | -1/+1 |
|\| | | | | | | | |||||
| * | | | | | | | Doc: Fix extension plugin examples and documentation | Ulf Hermann | 2020-02-18 | 1 | -1/+1 |
* | | | | | | | | Quick: Don't qualify OpenGL includes (part two) | Johan Klokkhammer Helsing | 2020-02-18 | 1 | -2/+2 |
* | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-02-17 | 86 | -471/+697 |
|\| | | | | | | | |||||
| * | | | | | | | Modernize type registration in new examples | Ulf Hermann | 2020-02-11 | 9 | -12/+12 |
| * | | | | | | | Avoid discouraged patterns in examples | Ulf Hermann | 2020-02-11 | 75 | -418/+631 |
| * | | | | | | | Avoid access to properties of parent in imagelements example | Ulf Hermann | 2020-02-06 | 2 | -8/+28 |
| * | | | | | | | Use inline components for sharing example | Ulf Hermann | 2020-02-06 | 1 | -44/+38 |
* | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-30 | 1 | -1/+1 |
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Fix vertical position of PathText | Eskil Abrahamsen Blomfeldt | 2020-01-29 | 1 | -1/+1 |
* | | | | | | | Quick: Don't qualify OpenGL includes | Ulf Hermann | 2020-01-27 | 6 | -12/+12 |
* | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-25 | 10 | -1/+78 |
|\| | | | | | | |||||
| * | | | | | | Introduce PathText path element | Eskil Abrahamsen Blomfeldt | 2020-01-21 | 4 | -1/+78 |
| * | | | | | | Upgrade qsb files to version 4 | Laszlo Agocs | 2020-01-21 | 6 | -0/+0 |
* | | | | | | | Use required properties to fix some more qmllint warnings | Ulf Hermann | 2020-01-23 | 2 | -2/+6 |
* | | | | | | | Make FontLoader.name read-only | Eskil Abrahamsen Blomfeldt | 2020-01-21 | 2 | -8/+2 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-14 | 49 | -293/+480 |
|\| | | | | | |||||
| * | | | | | Generate registrations for all examples | Ulf Hermann | 2020-01-13 | 46 | -249/+371 |
| * | | | | | Make draganddrop example less confusing | Ulf Hermann | 2020-01-10 | 3 | -44/+109 |
* | | | | | | Remove D3D12 scenegraph backend | Laszlo Agocs | 2020-01-06 | 16 | -569/+0 |
|/ / / / / | |||||
* | | | | | Minimal documentation for new example | Paul Olav Tvete | 2019-12-12 | 2 | -0/+48 |