summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| | | | | | | + 9f056f7902350106d992d43cb04a9e2f6b6b299b Bump version Change-Id: I83144083326956792554642898a6cc5863a396ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: Iaf712608e1c272d5718eb2d3a410c24daeb422c8
* Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
|\ | | | | | | Change-Id: Iee34ddde965c73f0c6a1194fc74cd805e9a89f45
| * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-101-0/+20
|/ | | | | | | | | | | + b2685b64d1f2fef2ef1f3f3542379fb8f052d113 Avoid using 'for..in' to iterate over collections + ee688ba13ec8c874d01c4e2d630eef6b31abd6ad Skip TestWebChannel::testAsyncObject() + abde21e4e86c2bff379c4ce78ad5040350df0b3e Add binary compatibility file for qtwebchannel 5.14 branch + 8d2c3b42bf6e4119b35910492b245fd5dac4998d Bump version + 6d970e69549645b886988aed8a026fdc0161f354 Doc: Remove linking to example source file Change-Id: Ifba7cc51cf914adf19d7fe28cbd723e885ebc629 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Doc: Remove linking to example source fileTopi Reinio2020-01-071-1/+1
| | | | | | | | | QDoc no longer treats example file pages as linkable targets. Remove the link command. Fixes: QTBUG-79810 Change-Id: Iac92e8007b7618345031617b8039e300328d21a3 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Bump versionDaniel Smith2019-12-161-1/+1
| | | | Change-Id: I3f198e2c66998e0879fce6c7efc09fd0f865ffff
* Add binary compatibility file for qtwebchannel 5.14 branchMilla Pohjanheimo2019-12-161-0/+6541
| | | | | | | BC file built against 5.14.0 added. Change-Id: Ie372b2971dc4fd373363b47bbb74f0d1e1de3bee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+31
|\ | | | | | | Change-Id: If385dc935ace95147b60c74b0312507be1884b1a
| * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-291-0/+31
| | | | | | | | | | Change-Id: I17584ca80ea86ed331bc6cd2bb1fc145922a261f Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Skip TestWebChannel::testAsyncObject()Ulf Hermann2019-12-121-0/+2
| | | | | | | | | | | | | | | | Blacklisting the test won't help as it frequently crashes. Task-number: QTBUG-74611 Change-Id: Ie7ef03c751af501d662596ea150e572c814fed82 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Avoid using 'for..in' to iterate over collectionsKirill Burtsev2019-11-221-27/+15
|/ | | | | | | | | | | | | 'for..in' construct iterates through enumerable properties meaning that user added properties to default type's prototype (like Array.prototype.first) are also included. Proper usage involves 'hasOwnProperty' but is not as clean and generally discouraged by popular style guides in favor of 'for..of' and 'Object.keys' and higher-order functions like 'forEach'. Adopt them for iteration to fix unexpected property warnings. Fixes: QTBUG-50999 Change-Id: Ia0846b0c5a2c34f5ee6f1dcb82198cb3946a95f1 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Examples: fix 'nodejs' and 'qwclient' compatibility with 'standalone'Kirill Burtsev2019-11-202-3/+3
| | | | | | | | Amends split of classes from 13294ce605 Fixes: QTBUG-75221 Change-Id: I9491fc59a76974c7a9e4784526ac8c2ba729edd7 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Example 'qwclient': fix lsObject() output of registered objectsKirill Burtsev2019-11-201-5/+11
| | | | | | Change-Id: I6b3f771eea2d92f0c3a7d05eeb13cf0b3d8b1ef4 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-051-0/+20
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5ca28b380fcb53c84e6a155d98b082139397191f
| * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | + 018b2740f793e1f4142d95736ff0554aa4e0a71d Binary compatibility file against Qt5.13.0 for QtWebChannel + 8943eb70b12603f5136e83d285c01b7d50dbb2cf Add changes file for Qt 5.12.5 Change-Id: I09f92b9cb8565a6351cc99ca0c3462c8e056c356 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | Change-Id: Ib94695d6fb7273ae2942d3d23c04bced7478137f
* | Update plugins.qmltypes for 5.14v5.14.0-beta3v5.14.0-beta2v5.14.0-beta1Kai Koehne2019-09-271-1/+1
| | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: Id5357073a90b77450ea4d69125432d7cde390b54 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-115-0/+6553
|\ \
| * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-115-0/+6553
| |\ \ |/ / / | | _ | | | | | | | | Conflicts: .qmake.conf Change-Id: I102c309ea3b543a896f2dc13e51b375973974e9e
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-091-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | |\ | |/ / | | | | | | Change-Id: I336d7915218d3802a16916fdb45658438645f491
| | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | |\ | | |/ / | | | | | | | | Change-Id: I6989619a742e53bd52518cac2fc61579dd614116
| | | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 8a610433fa26c2601d669b45e903566287923bec Bump version Change-Id: Ib733143bcd87cc018b76ddcd98446e01646eea87 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | |\ \ | |/ / / | | | | | | | | Change-Id: I637a652c26614bb01dee5e7bb770956e504f2435
| | * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-08-021-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 1466130070922a6cc55c2a5b724311780a394a13 Fix generic conversion of list-like values to JSON arrays + 7cb725d351d909675574a764fc19dd1f53d5c3e6 Bump version + b79562247f6dfe2ad26804c0eca891a529179dd0 Add changes file for Qt 5.12.4 + f119c0669bc261786e9151ec4b31f6cf1fd2e28b Doc: Minor text layout edits + dff2332c68e7c20676702648457f9d11f90cc93b Bump version + 8a610433fa26c2601d669b45e903566287923bec Bump version + 0b91813e2628b4cff00f76fe71bb5e46a68c4fa3 Doc: Replace example file lists with links to code.qt.io Change-Id: Id0fc8b3b95b7afe0424af241547b91fe51cb5a65 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Binary compatibility file against Qt5.13.0 for QtWebChannelMilla Pohjanheimo2019-08-141-0/+6492
| |/ / | | | | | | | | | | | | | | | | | | BC file added. Change-Id: I81f08844877abcafda197924c3bf8e523b8d0fee Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic05bb3b2a23431b871c8b19412aa2b1b14f5f6cf
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: I5cd8a61c19c02c3fb9c7a3bc150616feaae2f86a
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I8ce0f843469bafa760b14323ce5f36a220e1a7ef Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I68a3a5b77ca8eedd264d70f14bf27688cf708be2
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| | |\ \ | |/ / / | | | _ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ife7bae060093f2b7398aa03b303bb0b5198875ad
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |\ | | |/ / | | | | | | | | Change-Id: I084d7d3229e47ea2e53c53841a092a262c0a7583
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Id9e93b7ea3dc209839db23d6e5aa33dbb14e5879 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/ | | | | | | | | | Change-Id: I07657a2be55e65f7212619a7d7e908dc6d429748
* | | Correctly link transports to implicitly wrapped objectsArno Rehn2019-07-263-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an object is wrapped as consequence of a property update or signal emission, wrapResult() assigns it the parent object's list of transports. It didn't, however, establish the reverse relation, i.e from transport to object. This resulted in dangling pointers after client disconnects and subsequent crashes. This patch fixes the bug. Change-Id: I5d20269c453902bf2883dfcab1f3ab5d0757c2cd Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-222-10/+35
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-222-10/+35
| |\ \ \ |/ / / / | | _ / | | / Change-Id: Ia830dee20e2674c73551319be153ec3e638b5b0e
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+23
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+23
| | |\ \ | |/ / / | | | | | | | | Change-Id: Iccf3a27173aa33ac44e5f2f776d118cd59e5a5a2
| | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-081-0/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie919225d42d70933693a79d8d6a21e7f46b915f3 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * | | Doc: Minor text layout editsNico Vertriest2019-06-181-10/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I788cca691fd3a0b4542bad9ef05ef40404a42840 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Milian Wolff2019-05-282-1/+11
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devMilian Wolff2019-05-282-1/+11
| |\ \ \ \ |/ / / / / | | _ / / | | / / | | | | | | | | | | | | Conflicts: src/webchannel/qmetaobjectpublisher.cpp Change-Id: I853b8fc7270847c1a9cdd862dff278ddb2533e92
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-182-1/+11
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I182d51367aed4518f5bbc247e4e517af09028f7a
| | * Fix generic conversion of list-like values to JSON arraysArno Rehn2019-05-152-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, QVariant::toList() was used to convert a QVariant to a QVariantList. This only works for actual QVariantLists and QStringList, however. This patch uses QVariant::value<QVariantList>() which works in all cases. A better approach would be to extract a QSequentialIterable, but QTBUG-42016 currently prevents this. Change-Id: I732cc88a6db2ec5d990760364a9db98a52521f6b Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
View Lorry Controller Status