summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* | 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 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
|\ \ | |/ | | | | Change-Id: I5e513b5e3adb6fc5d352663c9f6fd00219b302e3
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| |\ | | | | | | | | | Change-Id: I1be343e2b85d2e66675c97eccccb3b9923446aef
| | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
| |/ | | | | | | | | | | | | + 05327921fd125a6e33cb32344ac54a7b023f8c62 Bump version Change-Id: I76187606b86ac0d726998a27ac30a35cda8e4a31 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Automatically register the latest import versionv5.13.0-beta3Kai Koehne2019-04-125-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 1.14 in Qt 5.14) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Change-Id: I2570c2bc50c629101adb763e5e5f90bc3ded8bac Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-011-0/+25
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1983581b7f4d6eb10a223a94234b388e38226a07
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I711c7bd9ad459aacace55fc0228808d884fc9286
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+25
| |\ | | | | | | | | | Change-Id: I89ee14855ca6e6ebb3182124584a0b00d792206f
| | * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-261-0/+25
| |/ | | | | | | | | | | | | | | | | | | | | + 45bc3ab0bbc292be26b2bf0596487d9c7f2059d3 Bump version + c80cbce7ac3b38a45a38b57795c7eb19e5177a17 Remove warning when the notify signal has more than one argument + 38f097ba76fe5b26ccc15a5599e312336200e564 Correctly convert enums and QFlags from and to JSON + 38b5128c63ba38303f0587e03536ed546c1f2eca Correctly unwrap registered objects + d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4 Also add already wrapped objects to the transport-to-objects map Change-Id: I8f186bc47f8df9608c340a02183fbc06429f4c14 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-262-2/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: I475d01064a76d73641ac8717cc51133863d22507 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Doc: Fix some qdoc errorsNico Vertriest2019-03-251-2/+2
| | | | | | | | | | | | | | | | | | - add documentation to parameter \a objects - correct link to example code Change-Id: Idedfd749dad01315ee0073ca5a87399b9fa30d70 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Liang Qi2019-02-253-0/+40
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/webchannel/qmetaobjectpublisher.cpp Done-With: Arno Rehn <a.rehn@menlosystems.com> Change-Id: I763a76cf055547c5c5e59511ded51c467d6c7526
| * Also add already wrapped objects to the transport-to-objects mapArno Rehn2019-02-043-2/+23
| | | | | | | | | | | | | | | | | | | | | | Fixes a crash: Previously, when a connection was closed, the transport was not removed from the list of transports of a wrapped objects. This was because the transport was not added to the transport-to-object map in the first place. When a property update was pushed, the now dangling pointer to the "old" transport caused a crash. Change-Id: Ib980f0b874851f8f85f7a3d76d51a2c884504b96 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Correctly unwrap registered objectsArno Rehn2019-02-043-0/+23
| | | | | | | | | | | | | | | | | | Previously, only implicitly wrapped objects have been successfully unwrapped. "Officially" registered objects were not, and thus could not be passed to properties or as method arguments. Change-Id: I6b8644ed3be8db3a66c2c1d5bc167fc33a0b4165 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-025-5/+6228
|\ \ | |/ | | | | Change-Id: I6b83cc26dddfafe3bebe1bfb3640e2daf2d9a8fb
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+6137
| |\ | | | | | | | | | Change-Id: I49e55df5f1c518ec62800572601e493f483faada
| | * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + faab35b4f88c634510e56adcfa6f12f0fef548bb Bump version + 94fee0eaa3a5ce98bae8e5d68c91c0366fa94cdc Add changes file for Qt 5.11.3 + 7aba0a480990090fd4412a262c93ec684b7ab908 Add binary compatibility file for QtWebChannel for Qt 5.12 + 68ab691b04d14c8a5582c14842246b1041436094 Bump version Change-Id: I6aed56c63e3ff8dba742e354d6f8ff5c7cbdb69a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-082-1/+21
| | |\ | | | | | | | | | | | | Change-Id: If92a74443a5747c3307b2683461ad677659de135
| | * | Add binary compatibility file for QtWebChannel for Qt 5.12Milla Pohjanheimo2018-12-181-0/+6117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I3faf447d11526f599fe826ac02d7f4c0815a7e8f Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * | | Correctly convert enums and QFlags from and to JSONArno Rehn2019-01-313-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, enums declared with Q_ENUM were stringified in the conversion to JSON and QFlags did not work at all. The conversion of QJsonValue(int) to enum worked fine, however. This patch implements some extra logic for detecting enums and QFlags, thus correctly converting to and from integers. [ChangeLog] Enum values and QFlags are now correctly converted to and from integers in the JS interface Fixes: QTBUG-72924 Change-Id: I23d4a1120b805201c8d450edbd990aad5ad258a2 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | | Remove warning when the notify signal has more than one argumentArno Rehn2019-01-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The warning was not meaningful, since nothing depends on the notify signal having only zero or one argument(s). Removing this decreases warning noise in some applications. Change-Id: Ieb716ad9ac51296a1e17899018d4e6190043b8d5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5e399965c268c2cd7c5dd0828729a6fbd6d97795
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | |/ | |/| | | | | | | Change-Id: I892ab0f1a27edf60c9d5272b47e32a2e4639197f
View Lorry Controller Status