aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-08-0824-529/+729
|\
| * Normalize dashOffset behavior between renderer backendsBerthold Krevert2017-08-051-3/+3
| * shapes: Rip out more JS API leftoversLaszlo Agocs2017-07-318-291/+49
| * Move shapes-related shaders to under the shapes pluginLaszlo Agocs2017-07-2913-6/+122
| * Rename property to rendererTypeBerthold Krevert2017-07-282-2/+2
| * Check for GL_NV_path_rendering extensionBerthold Krevert2017-07-251-2/+6
| * shapes: Add example linksLaszlo Agocs2017-07-061-1/+3
| * shape: Revise performance notes in the docsLaszlo Agocs2017-07-061-22/+37
| * shape: Call base impl for componentCompleteLaszlo Agocs2017-07-061-3/+3
| * shapes: Remove componentComplete from QQuickShapePrivateThomas Hartmann2017-07-062-3/+1
| * Update plugins.qmltypes for ShapesMarco Benelli2017-07-061-192/+25
| * Update QtQuick 2 plugins.qmltypesThomas Hartmann2017-07-061-2/+12
| * Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-041-2/+466
| |\
| | * QtQml: restore models definitions in qmltypesMarco Benelli2017-06-291-2/+466
* | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerJan Arve Saether2017-07-1122-67/+5819
|\| |
| * | shapes: Convert QT_NO_OPENGL to QT_CONFIG(opengl)Liang Qi2017-06-267-20/+32
| * | Add Q_ASSERT to test prevNodeJesus Fernandez2017-06-261-0/+1
| * | Initialize uniform location variablesJesus Fernandez2017-06-261-2/+2
| * | Initialize variablesJesus Fernandez2017-06-261-4/+4
| * | Initialize pointerJesus Fernandez2017-06-261-1/+1
| * | Initialize pointerJesus Fernandez2017-06-261-1/+2
| * | Update plugins.qmltypesMitch Curtis2017-06-221-8/+25
| * | Merge branch 'wip/scenegraphng' into devLaszlo Agocs2017-06-1917-0/+5691
| |\ \
| | * | Rename to vendorExtensionsEnableLaszlo Agocs2017-06-192-9/+9
| | * | Allow freely mixing non-ShapePath objects in ShapeLaszlo Agocs2017-06-082-29/+29
| | * | Use GradientStop and rename ShapeLinearGradient to LinearGradientLaszlo Agocs2017-06-087-191/+30
| | * | Merge remote-tracking branch 'origin/dev' into wip/scenegraphngLaszlo Agocs2017-06-084-58/+62
| | |\ \
| | * | | Reduce objects: Make ShapePath inherit PathLaszlo Agocs2017-06-073-91/+48
| | * | | Rename to Shape/ShapePath and remove public JS APILaszlo Agocs2017-06-0220-2765/+1953
| | * | | Merge remote-tracking branch 'origin/dev' into wip/scenegraphngLaszlo Agocs2017-05-3114-55/+80
| | |\ \ \
| | * | | | Move PathItem to qt.labsLaszlo Agocs2017-04-2517-0/+6707
| * | | | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-151-0/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | qmltest: fix compare() for urlsLiang Qi2017-06-141-0/+4
| * | | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-073-5/+18
| |\| | |
| | * | | Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-3/+15
| | |\ \ \
| | | * | | QML Settings: fix JS array handlingJ-P Nurmi2017-05-191-3/+15
| | * | | | Update qmltypesMarco Benelli2017-05-232-2/+3
| * | | | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-061-53/+44
| |\| | | | | | |_|_|/ | |/| | |
| | * | | Get rid of the old way of defining builtin functionsLars Knoll2017-05-191-53/+44
| | |/ /
| * | | TestCase: Grow some new functionality on grabImageRobin Burchell2017-05-111-1/+23
* | | | PointerHandlers plugin: fix the build on iOSShawn Rutledge2017-05-301-1/+1
* | | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-05-0813-54/+57
|\| | |
| * | | Merge remote-tracking branch 'origin/5.9' into devLars Knoll2017-05-0213-54/+57
| |\| | | | |/ | |/|
| | * Polish the shared image providerEirik Aavitsland2017-04-287-54/+46
| | * Run includemocs in qtdeclarativeThiago Macieira2017-04-266-0/+11
* | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-04-138-76/+243
|\| |
| * | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-04-072-2/+4
| |\|
| | * Fix build without features.sqlTasuku Suzuki2017-04-051-1/+1
| | * Fix build without features.systemsemaphoreTasuku Suzuki2017-04-051-1/+1
| | * Fix warning for -no-feature-settingsStephan Binner2017-04-041-0/+2