summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-184-4/+98
|\
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-3/+3
| |\
| | * Clean up TestWebChannel::testAsyncObjectv5.9.45.9.4Sami Nurmenniemi2018-01-091-12/+3
| | * Fix TestWebChannel::testAsyncObjectSami Nurmenniemi2018-01-091-3/+12
| * | Allow deleting a channel during method invocationJüri Valdmann2018-01-083-4/+73
| |/
| * Add changes file for Qt 5.9.4Antti Kokko2018-01-051-0/+25
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| |\
* | | Add binary compatibility file for QtWebChannel for 5.10Milla Pohjanheimo2018-01-091-0/+5982
* | | Clean up TestWebChannel::testAsyncObjectSami Nurmenniemi2017-12-291-12/+3
* | | Fix TestWebChannel::testAsyncObjectSami Nurmenniemi2017-12-281-3/+12
* | | Bump versionOswald Buddenhagen2017-12-201-1/+1
* | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+46
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+24
| |\ \ \ | | | |/ | | |/|
| | * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-131-0/+24
| | |/
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-201-0/+22
|/ /
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-305-12/+41
|\ \ | |/
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+29
| |\
| | * Add changes file for Qt 5.9.2v5.9.25.9.2Milian Wolff2017-09-221-0/+29
| * | Fix outdated FDL headerKai Koehne2017-09-294-12/+12
| |/
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2v5.10.0-beta1Liang Qi2017-09-2026-291/+671
|\ \ | |/
| * Highlight standalone exampleKai Koehne2017-09-141-0/+2
| * qmlchatclient: Make main window visible by defaultKai Koehne2017-09-121-0/+1
| * Fix class name in standalone documentationKai Koehne2017-09-121-3/+3
| * Make chatclient-qml designer-friendlyKai Koehne2017-09-124-69/+209
| * chatclient-qml: Show errors in a dialogKai Koehne2017-09-121-6/+21
| * Give example a meaningful window titleKai Koehne2017-09-121-1/+1
| * Chatclient-qml: Use QtQuick.Controls 2Kai Koehne2017-09-121-1/+1
| * Beautify code of qmlchatclient exampleKai Koehne2017-09-121-50/+68
| * Examples: beautify JavaScript snippetsKai Koehne2017-09-085-65/+69
| * Split up classes in standalone exampleKai Koehne2017-09-086-71/+267
| * Examples: Use canonical include style and sort #includeKai Koehne2017-09-066-19/+15
| * Allow examples to be built without module sourcesKai Koehne2017-09-063-10/+6
| * Add change file for Qt 5.6.3Milian Wolff2017-09-061-0/+28
| * Examples: Fix coding style issuesKai Koehne2017-08-293-11/+11
| * Examples: Use Qt 5 connectKai Koehne2017-08-292-3/+3
| * Examples: Use override keywordKai Koehne2017-08-291-1/+1
| * Examples: Use signals and slots keywordsKai Koehne2017-08-292-3/+3
| * Examples: Use nullptrKai Koehne2017-08-293-3/+3
| * Examples: Use canonical include guardsKai Koehne2017-08-292-6/+6
| * Examples: Do not put example code in Qt namespaceKai Koehne2017-08-296-22/+6
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1Liang Qi2017-08-155-12/+5726
|\ \ | |/
| * Do not crash on non-QVariant return typesMilian Wolff2017-08-083-12/+41
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+24
| |\
| | * Add changes file for 5.9.1v5.9.15.9.1Jani Heikkinen2017-06-231-0/+24
| * | Bump versionOswald Buddenhagen2017-06-301-1/+1
| * | Update binary compatibility file for Qt5.9.0 for QtWebChannelMilla Pohjanheimo2017-06-301-0/+5661
| |/
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0713-1725/+5738
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+23
| |\