Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/dev' into wip/pointerhandler | Shawn Rutledge | 2017-08-08 | 24 | -529/+729 |
|\ | |||||
| * | Normalize dashOffset behavior between renderer backends | Berthold Krevert | 2017-08-05 | 1 | -3/+3 |
| * | shapes: Rip out more JS API leftovers | Laszlo Agocs | 2017-07-31 | 8 | -291/+49 |
| * | Move shapes-related shaders to under the shapes plugin | Laszlo Agocs | 2017-07-29 | 13 | -6/+122 |
| * | Rename property to rendererType | Berthold Krevert | 2017-07-28 | 2 | -2/+2 |
| * | Check for GL_NV_path_rendering extension | Berthold Krevert | 2017-07-25 | 1 | -2/+6 |
| * | shapes: Add example links | Laszlo Agocs | 2017-07-06 | 1 | -1/+3 |
| * | shape: Revise performance notes in the docs | Laszlo Agocs | 2017-07-06 | 1 | -22/+37 |
| * | shape: Call base impl for componentComplete | Laszlo Agocs | 2017-07-06 | 1 | -3/+3 |
| * | shapes: Remove componentComplete from QQuickShapePrivate | Thomas Hartmann | 2017-07-06 | 2 | -3/+1 |
| * | Update plugins.qmltypes for Shapes | Marco Benelli | 2017-07-06 | 1 | -192/+25 |
| * | Update QtQuick 2 plugins.qmltypes | Thomas Hartmann | 2017-07-06 | 1 | -2/+12 |
| * | Merge remote-tracking branch 'origin/5.9' into dev | Liang Qi | 2017-07-04 | 1 | -2/+466 |
| |\ | |||||
| | * | QtQml: restore models definitions in qmltypes | Marco Benelli | 2017-06-29 | 1 | -2/+466 |
* | | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandler | Jan Arve Saether | 2017-07-11 | 22 | -67/+5819 |
|\| | | |||||
| * | | shapes: Convert QT_NO_OPENGL to QT_CONFIG(opengl) | Liang Qi | 2017-06-26 | 7 | -20/+32 |
| * | | Add Q_ASSERT to test prevNode | Jesus Fernandez | 2017-06-26 | 1 | -0/+1 |
| * | | Initialize uniform location variables | Jesus Fernandez | 2017-06-26 | 1 | -2/+2 |
| * | | Initialize variables | Jesus Fernandez | 2017-06-26 | 1 | -4/+4 |
| * | | Initialize pointer | Jesus Fernandez | 2017-06-26 | 1 | -1/+1 |
| * | | Initialize pointer | Jesus Fernandez | 2017-06-26 | 1 | -1/+2 |
| * | | Update plugins.qmltypes | Mitch Curtis | 2017-06-22 | 1 | -8/+25 |
| * | | Merge branch 'wip/scenegraphng' into dev | Laszlo Agocs | 2017-06-19 | 17 | -0/+5691 |
| |\ \ | |||||
| | * | | Rename to vendorExtensionsEnable | Laszlo Agocs | 2017-06-19 | 2 | -9/+9 |
| | * | | Allow freely mixing non-ShapePath objects in Shape | Laszlo Agocs | 2017-06-08 | 2 | -29/+29 |
| | * | | Use GradientStop and rename ShapeLinearGradient to LinearGradient | Laszlo Agocs | 2017-06-08 | 7 | -191/+30 |
| | * | | Merge remote-tracking branch 'origin/dev' into wip/scenegraphng | Laszlo Agocs | 2017-06-08 | 4 | -58/+62 |
| | |\ \ | |||||
| | * | | | Reduce objects: Make ShapePath inherit Path | Laszlo Agocs | 2017-06-07 | 3 | -91/+48 |
| | * | | | Rename to Shape/ShapePath and remove public JS API | Laszlo Agocs | 2017-06-02 | 20 | -2765/+1953 |
| | * | | | Merge remote-tracking branch 'origin/dev' into wip/scenegraphng | Laszlo Agocs | 2017-05-31 | 14 | -55/+80 |
| | |\ \ \ | |||||
| | * | | | | Move PathItem to qt.labs | Laszlo Agocs | 2017-04-25 | 17 | -0/+6707 |
| * | | | | | Merge remote-tracking branch 'origin/5.9' into dev | Liang Qi | 2017-06-15 | 1 | -0/+4 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | qmltest: fix compare() for urls | Liang Qi | 2017-06-14 | 1 | -0/+4 |
| * | | | | Merge remote-tracking branch 'origin/5.9' into dev | Liang Qi | 2017-06-07 | 3 | -5/+18 |
| |\| | | | |||||
| | * | | | Merge remote-tracking branch 'origin/5.9.0' into 5.9 | Liang Qi | 2017-05-31 | 1 | -3/+15 |
| | |\ \ \ | |||||
| | | * | | | QML Settings: fix JS array handling | J-P Nurmi | 2017-05-19 | 1 | -3/+15 |
| | * | | | | Update qmltypes | Marco Benelli | 2017-05-23 | 2 | -2/+3 |
| * | | | | | Merge remote-tracking branch 'origin/5.9' into dev | Liang Qi | 2017-06-06 | 1 | -53/+44 |
| |\| | | | | | |_|_|/ | |/| | | | |||||
| | * | | | Get rid of the old way of defining builtin functions | Lars Knoll | 2017-05-19 | 1 | -53/+44 |
| | |/ / | |||||
| * | | | TestCase: Grow some new functionality on grabImage | Robin Burchell | 2017-05-11 | 1 | -1/+23 |
* | | | | PointerHandlers plugin: fix the build on iOS | Shawn Rutledge | 2017-05-30 | 1 | -1/+1 |
* | | | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandler | Shawn Rutledge | 2017-05-08 | 13 | -54/+57 |
|\| | | | |||||
| * | | | Merge remote-tracking branch 'origin/5.9' into dev | Lars Knoll | 2017-05-02 | 13 | -54/+57 |
| |\| | | | |/ | |/| | |||||
| | * | Polish the shared image provider | Eirik Aavitsland | 2017-04-28 | 7 | -54/+46 |
| | * | Run includemocs in qtdeclarative | Thiago Macieira | 2017-04-26 | 6 | -0/+11 |
* | | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandler | Shawn Rutledge | 2017-04-13 | 8 | -76/+243 |
|\| | | |||||
| * | | Merge remote-tracking branch 'origin/5.9' into dev | Simon Hausmann | 2017-04-07 | 2 | -2/+4 |
| |\| | |||||
| | * | Fix build without features.sql | Tasuku Suzuki | 2017-04-05 | 1 | -1/+1 |
| | * | Fix build without features.systemsemaphore | Tasuku Suzuki | 2017-04-05 | 1 | -1/+1 |
| | * | Fix warning for -no-feature-settings | Stephan Binner | 2017-04-04 | 1 | -0/+2 |