summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-241-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-191-1/+1
| |\ \ | | |/
| | * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.15.6.1Topi Reinio2016-05-121-1/+1
* | | Clarify the module descriptionFrank Meerkoetter2016-04-251-8/+7
* | | Fix typoFrank Meerkoetter2016-04-131-1/+1
* | | Fix broken linkFrank Meerkoetter2016-04-131-1/+1
|/ /
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-03-074-6/+6
|\ \ | |/
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-033-4/+4
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-156-1/+56
|\ \ | |/
| * Add the "We mean it" warning to private headersv5.6.0-rc1v5.6.05.6.0Sergio Martins2016-02-095-0/+55
| * Doc: Update examplesinstallpath to include the repository namev5.6.0-beta1Topi Reinio2015-10-211-1/+1
* | Enable using the module in a statically linked applicationAndy Shaw2016-02-041-0/+8
* | Updated license headersAntti Kokko2016-01-2017-241/+343
|/
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-022-4/+4
|\
| * Compile when QML is disabled5.5Andy Shaw2015-09-292-0/+6
* | Fix #include's in public headersPierre Rossi2015-08-192-3/+3
* | Fix builds without qml moduleJulien Corjon2015-07-242-0/+6
* | Support subclass property getters and setters.Pierre Rossi2015-07-081-0/+1
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-5/+13
|\ \ | |/
| * Doc: Added a brief overview about the modulev5.5.0-beta1Venugopal Shivashankar2015-04-201-5/+13
* | Fix wrap registered object issueLutz Schönemann2015-05-152-4/+7
|/
* Update copyright headersv5.5.0-alpha1Antti Kokko2015-02-1720-120/+120
* Merge branch '5.4' into devMilian Wolff2015-02-046-92/+160
|\
| * Update plugins.qmltypesKai Koehne2014-12-042-32/+32
| * Fix crash on signal after deregistrationLutz Schönemann2014-12-032-9/+17
| * Fix: Delete objects even when no transport is availableLutz Schönemann2014-12-021-0/+2
| * Make objects inside properties accessible.Milian Wolff2014-12-023-35/+85
* | Make the tests less flaky and don't send empty property updates.Milian Wolff2015-01-161-4/+6