aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Lars Knoll2017-09-201-0/+9
|\
| * Settings: document how to have several categoriesMitch Curtis2017-09-071-0/+9
* | qmltest: Enumerate test cases / functions without evaluating QMLTor Arne Vestbø2017-09-131-25/+0
* | shapes: Reduce stroke/fill node dataLaszlo Agocs2017-09-052-27/+14
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-053-5/+5
|\|
| * Doc: Fix capitalization in section titlesTopi Reinio2017-08-293-5/+5
* | Revert "Make QtQuickTest::mouseEvent use QTest::mouseX"Jani Heikkinen2017-09-041-18/+6
* | Merge dev into 5.10Frederik Gladhorn2017-09-022-19/+24
|\ \
| * | Make QtQuickTest::mouseEvent use QTest::mouseXAlbert Astals Cid2017-08-301-6/+18
| * | QQmlSettings: use categorised loggingMitch Curtis2017-08-291-13/+6
* | | Doc: Fix issues for Qt Quick Shapes documentationTopi Reinio2017-09-011-109/+125
* | | Fix some qdoc warnings for 5.10Friedemann Kleint2017-08-281-0/+2
|/ /
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-08-181-4/+4
|\|
| * Use QQmlType by valueLars Knoll2017-08-021-4/+4
* | Nvpr renderer: Adapt QPen behavior when setting dashPatternBerthold Krevert2017-08-091-3/+16
* | shapes: Remove unused signalLaszlo Agocs2017-08-091-1/+0
* | Merge "Merge branch 'wip/pointerhandler' into dev" into refs/staging/devShawn Rutledge2017-08-094-0/+105
|\ \
| * \ Merge branch 'wip/pointerhandler' into devShawn Rutledge2017-08-084-0/+105
| |\ \
| | * \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-08-0824-529/+729
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerJan Arve Saether2017-07-1122-67/+5819
| | |\ \ \
| | * | | | 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/dev' into wip/pointerhandlerShawn Rutledge2017-04-138-76/+243
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-03-023-35/+26
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-02-028-0/+715
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-01-2613-40/+61
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-12-282-10/+23
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-12-2015-73/+459
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-11-1715-72/+46
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/5.8' into wip/pointerhandlerShawn Rutledge2016-10-0715-1283/+278
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch remote-tracking branch '5.8' into wip/pointerhandlerShawn Rutledge2016-08-236-18/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Introduce QQuickPointerHandler: base class for nested event handlersShawn Rutledge2016-08-154-0/+105
* | | | | | | | | | | | | | | | shapes: Add support for conical gradientsLaszlo Agocs2017-08-0813-5/+403
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | / / shapes: Add support for radial gradientsLaszlo Agocs2017-08-0814-94/+646
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
* | | | | | | | | | | | | 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