summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-181-1/+4
|\
| * Fix generic conversion of list-like values to JSON arraysArno Rehn2019-05-151-1/+4
* | Automatically register the latest import versionv5.13.0-beta3Kai Koehne2019-04-125-9/+12
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-262-2/+5
* | Doc: Fix some qdoc errorsNico Vertriest2019-03-251-2/+2
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Liang Qi2019-02-251-0/+3
|\ \ | |/
| * Also add already wrapped objects to the transport-to-objects mapArno Rehn2019-02-041-2/+6
| * Correctly unwrap registered objectsArno Rehn2019-02-041-0/+3
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-5/+34
|\ \ | |/
| * Correctly convert enums and QFlags from and to JSONArno Rehn2019-01-311-0/+34
| * Remove warning when the notify signal has more than one argumentArno Rehn2019-01-231-5/+0
* | Prevent crashes by fixing mapping of transport to wrapped objectsMilian Wolff2018-10-251-1/+3
* | Fix UBSAN warning when downcasting partially destroyed objectMilian Wolff2018-10-251-4/+6
|/
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-261-21/+9
|\
| * Use FDL license for all .qdoc filesKai Koehne2018-05-231-21/+9
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-191-0/+9
|\ \ | |/
| * Doc: Add license details to index pageKai Koehne2018-05-141-0/+9
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-05-011-8/+1
|/
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-201-3/+9
|\
| * Allow deleting a channel during method invocationJüri Valdmann2018-01-081-3/+9
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-204-12/+12
|\ \ | |/
| * Fix outdated FDL headerKai Koehne2017-09-294-12/+12
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-09-223-428/+3
|\ \ | |/
| * Highlight standalone exampleKai Koehne2017-09-141-0/+2
| * Allow examples to be built without module sourcesKai Koehne2017-09-062-428/+1
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-212-2/+2
|/
* Do not crash on non-QVariant return typesMilian Wolff2017-08-081-2/+2
* Gracefully handle early deregistration of objectsMilian Wolff2017-05-151-2/+6
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-262-11/+15
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-012-11/+15
| |\
| | * Fix asynchronous signals from QObjects in different threadsDave Andrews2016-09-291-1/+1
| | * Fix asynchronous method calls on QObjects in different threadsDave Andrews2016-09-291-10/+14
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-013-1/+35
| |\ \ | | |/
| | * Remove deleted transport objectsKai Dohmen2016-07-213-1/+35
* | | Fix loading of QML pluginsv5.8.0-beta1v5.8.0-alpha1Simon Hausmann2016-08-291-1/+1
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-2111-57/+196
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-158-54/+134
| |\ \ | | |/
| | * Properly unwrap QObject signal parameters on the JavaScript side.Milian Wolff2016-06-281-1/+1
| | * Make passing objects from website to server possibleKai Dohmen2016-06-213-27/+56
| | * Doc: Fix linking to methods and properties within the typeLeena Miettinen2016-06-011-6/+6
| | * Doc: Use 3rd person singular verb form to begin method docsLeena Miettinen2016-06-011-4/+5
| | * Doc: Use standard verb form to start function docsLeena Miettinen2016-05-312-5/+5
| | * Doc: Fix links to other modulesLeena Miettinen2016-05-313-13/+11
| | * Doc: Edit the index pageLeena Miettinen2016-05-311-8/+32
| | * Doc: Edit example documentationLeena Miettinen2016-05-313-2/+61
| | * Fix setting properties of QJson{Value,Array,Object} type.Milian Wolff2016-05-262-8/+17
| | * Enable calling C++ functions taking QJson arguments via webchannel.Milian Wolff2016-05-251-5/+24
| * | Doc: Edit example documentationLeena Miettinen2016-06-023-2/+61
* | | Remove deleted transport objectsKai Dohmen2016-05-313-1/+35