aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-12-282-10/+23
|\
| * Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-251-2/+20
| |\
| | * Doc: added support for JSON in localstorage documentationNico Vertriest2016-12-201-2/+20
| * | TestCase: make parent argument to createTemporaryObject optionalMitch Curtis2016-12-211-7/+1
| * | TestCase: don't try to access destroyed temporary objectsMitch Curtis2016-12-211-1/+2
* | | Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-12-2015-73/+459
|\| |
| * | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1410-68/+75
| |\|
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.8Lars Knoll2016-12-074-48/+51
| | |\
| | | * Layouts: Use QQuickItemChangeListener for more thingsRobin Burchell2016-11-304-48/+51
| | * | Fix SignalSpy with QQmlPropertyMap signalsAlbert Astals Cid2016-11-301-2/+8
| | * | Get rid of most QT_NO_FOO usagesLars Knoll2016-11-294-15/+13
| | |/
| | * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-281-3/+3
| | |\
| | | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-251-3/+3
| | | |\
| | | | * Doc: improve FolderListModel::rootFolder documentationMitch Curtis2016-11-151-3/+3
| * | | | TestCase: add createTemporaryObject(), createTemporaryQmlObject()Mitch Curtis2016-12-142-0/+161
| * | | | Add touch event support to qmltestJeremy Katz2016-12-063-0/+214
| * | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-232-5/+9
| |\| | |
| | * | | Merge remote-tracking branch 'origin/5.7' into 5.8Simon Hausmann2016-11-151-3/+3
| | |\| |
| | | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-151-0/+5
| | | |\|
| | | | * Fix more cases where DSE would optimize out too many storesErik Verbruggen2016-11-101-0/+5
| | | * | Doc: replace "the empty string" with "an empty string" in TestCase docsMitch Curtis2016-11-101-3/+3
| | * | | Update Window plugins.qmltypesMarco Benelli2016-11-091-2/+6
* | | | | Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-11-1715-72/+46
|\| | | |
| * | | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-032-4/+2
| |\| | |
| | * | | Imports: Build settings depending on feature settingsFriedemann Kleint2016-11-012-4/+2
| * | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-221-27/+3
| |\| | |
| | * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-201-27/+3
| | |\| |
| | | * | Row/Column/GridLayout: add missing margins properties to documentationMitch Curtis2016-10-141-27/+3
| * | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-181-26/+37
| |\| | |
| * | | | Qml, Imports: mark some methods as constAnton Kudryavtsev2016-10-131-1/+1
| * | | | LocalStorage plugin: fix warning with debug buildAnton Kudryavtsev2016-10-101-1/+1
| * | | | Imports: add missing 'override'Anton Kudryavtsev2016-10-0610-29/+29
| * | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-012-4/+18
| |\ \ \ \
| * | | | | FolderListModel/FileProperty: Use member initializationFriedemann Kleint2016-09-231-10/+10
* | | | | | Merge remote-tracking branch 'origin/5.8' into wip/pointerhandlerShawn Rutledge2016-10-0715-1283/+278
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | QML: Also check for correct destroy() chainingErik Verbruggen2016-10-061-0/+1
| * | | | | QML: Make Heap::Object and all subclasses trivialErik Verbruggen2016-10-061-1/+2
| * | | | | QML: Introduce destroy() on Base subclassesErik Verbruggen2016-10-051-25/+34
| | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-212-4/+18
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Fix crash on exit when using default property aliases with layoutsMitch Curtis2016-09-151-0/+4
| | * | Doc: Updated Local Storage QML Types documentationNico Vertriest2016-09-121-4/+14
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-08-251-1/+5
| | |\|
| | | * Fix crash in tst_qqmlextensionplugin on shutdownSimon Hausmann2016-08-251-1/+6
| * | | Update .qmltypesMarco Benelli2016-09-1213-1253/+223
* | | | Merge branch remote-tracking branch '5.8' into wip/pointerhandlerShawn Rutledge2016-08-236-18/+15
|\| | |
| * | | Imports: replace 'foreach' with 'range for'Anton Kudryavtsev2016-08-201-3/+2
| * | | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devLiang Qi2016-08-193-10/+6
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-193-10/+6
| | |\| |
| | | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-191-4/+5
| | | |\|
| | | | * TestCase::mouseDrag: set mouse move delay >= 1 msShawn Rutledge2016-08-191-4/+5