summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgpl5.15Tarja Sundqvist2023-03-231-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ibdaaf669bbfb5aa6bf6ab721d79d0ddd3017417a
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I90476540299694bcce166dbb5bda2c83c83e3913
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic81cdcb7f226ad0261967dc0671db8569a951412
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I370141ea3660fe818bdba4947be05d616610edb5
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I385806e3c5149d9a106ba8b48ee84c88eb81f38d
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-06-021-1/+1
|\ \ | |/ | | | | tqtc/lts-5.15-opensource
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I37c71531112cbf774bf3d5ac8256c46b3ac9a22b
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I603c7f7389417ecac676056b2350765c031aef37
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I4a2813a7d940d77864f4aba724efe9a07312ed70
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2315-297/+297
|/ | | | | | | | | | | This reverts commit 5c35d1cd85ebd015b3fcc758af798ca2af90a7f9. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I67efc11823ca31a147664a468a118f05718b4581 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-2715-297/+297
| | | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtwebchannel. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4219 Change-Id: I5e919619b7123243b848efa639b7bbe5e3deae56 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+34
| | | | | | | | | | | | + 62f2be9de24bd3760f507e3ceda5b5a1a7f3dbec Fix infinite recursion when wrapping a self-contained object twice - 6bc9b38c599cd535191d8f434664b59b8a03de24 Add changes file for Qt 5.15.1 + dd4ea8c5df141872df444af770d1672ed60a2253 Bump version + b616ed1f55e6fa36da34c8f9752c4b661afbc98d Add changes file for Qt 5.12.10 Change-Id: I60b471286e6170f2b36ac30c46e797d9a88dfdb9 Reviewed-by: Arno Rehn <a.rehn@menlosystems.com> (cherry picked from commit 90cffd49575b075b0dc28440c693753d860fee87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: Icccbc5e0af71a0aec3cda6bb9a400b8319bd9ff1
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I5927d02d32c8ae3097aebdc223511543f19ae348 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 7219a32c30d21bc6cc8fe2121e28d19da3d67b00) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I17ca01ff2692acfccf900cfd8bd4104f6f9cc021
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | | | + ed798d76d6618d0deffb3916ca27ccad8252be68 Do not build qtwebchannel on Integrity + 37501a49ef9d61f3e6af9d08eee89ffddf9da489 Bump version + e1487e8192ca287f29f0f20c616aba972872b7ae Add binary compatibility file for 5.15 for QtWebChannel Change-Id: Iac45ea16798cc4735add87e4ac681193d8a9e7a6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 5bab22c141948e6215bd5239e22926b4c2e9b332) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix infinite recursion when wrapping a self-contained object twiceArno Rehn2020-08-243-8/+20
| | | | | | | | | | | | | | | | | | | The previous unit test for self-contained objects only wrapped the test object once. After wrapping, a different code path is taken which still exhibited infinite recursion. This patch addresses both the unit test and the infinite recursion. To fix the problem, a boolean in the ObjectInfo struct is toggled to indicate whether the object in question is currently being wrapped. If that is the case, the recursing code path is skipped. [ChangeLog][General] Fixed infinite recursion when dealing with self contained objects. Fixes: QTBUG-84007 Change-Id: Ie0898fb5f28cec91587897835ff937672d60f2a1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (adapted from commit 0451ef836415c93a6beb68a315a25c6ab27f44fa) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add binary compatibility file for 5.15 for QtWebChannelMilla Pohjanheimo2020-08-171-0/+6618
| | | | | | | Binary compatibility file added. Change-Id: Id7d2bee9b2c675907dcdda4ee272f9d637e2c07d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I69ce386fb9f30aea5568f0095f712752ae601d6e
* Do not build qtwebchannel on IntegrityKai Koehne2020-07-151-0/+2
| | | | | | | | | | | Integrity is causing problems for some patches. Fixes: QTQAINFRA-3834 Change-Id: I6ad1e8dca42458655047efdc84371692a9e8e252 Reviewed-by: Arno Rehn <a.rehn@menlosystems.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit db70dab3c1b6ac099fc33b0aeb8de8b574073548) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I1854069685716e7852696622deed615fda98304a
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: I2792dbf37f2900f4c38ba5a2486556b530be8684
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: Ie2eb83c30b4241038a8789af2fea8fdfb594da14
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: Ic358290a41c238ecd7584dd75e5734b8f5c50c80
| | * | 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>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| |/ |/| | | | | | | | | | | | | | | | | | | | | + 869a1a5f7321dcd3fdd57735fb503a6d3506c616 Bump version + 2f5e7d048f291580a83677b415f4758aab04882a Fix documentation to use commonly working syntax for property changes + 1f793c887773f9b7477a73467aa1e2497ffef25c Update plugins.qmltypes for 5.15 + bdec52548ca739e5533792c3bf656b8e2cf9fcb6 Restore compatibility with custom QVariantList/QVariantMap converters + cbbb6c38fa9b64e9e4eb98af0bf687ef469aa327 tst_webchannel: Don't use QSignalSpy for inter-thread signals + 4af709df207bf7c98ae5ffd699a66d33767d6300 Fix deprecation warning Change-Id: I86de18c94bf12b9b8bcd11b780e34e00f8c464df Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Fix deprecation warningVolker Hilsheimer2020-04-161-1/+1
| | | | | | | | | | Change-Id: Ieb3f0ef5e5b752613d664731e250dba14fb42f0a Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | tst_webchannel: Don't use QSignalSpy for inter-thread signalsMilian Wolff2020-04-151-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes data races reported by helgrind due to direct signal connection within QSignalSpy without any sort of serialization. ``` ==840094== Possible data race during write of size 4 at 0x1FFEFFD160 by thread #3 ==840094== Locks held: none ==840094== at 0x4F7DE5C: QListData::detach_grow(int*, int) (qlist.cpp:121) ==840094== by 0x125380: QList<QList<QVariant> >::detach_helper_grow(int, int) (in /ssd2/milian/projects/qt5/src/qtwebchannel/build/tests/auto/webchannel/tst_webchannel) ==840094== by 0x125598: QList<QList<QVariant> >::append(QList<QVariant> const&) (in /ssd2/milian/projects/qt5/src/qtwebchannel/build/tests/auto/webchannel/tst_webchannel) ==840094== by 0x127CEC: QSignalSpy::qt_metacall(QMetaObject::Call, int, void**) (in /ssd2/milian/projects/qt5/src/qtwebchannel/build/tests/auto/webchannel/tst_webchannel) ==840094== by 0x5149278: QMetaObject::metacall(QObject*, QMetaObject::Call, int, void**) (qmetaobject.cpp:316) ==840094== by 0x518BE13: QMetaObject::activate(QObject*, int, int, void**) (qobject.cpp:3825) ==840094== by 0x518B571: QMetaObject::activate(QObject*, QMetaObject const*, int, void**) (qobject.cpp:3660) ==840094== by 0x1281F5: TestObject::propChanged(QString const&) (in /ssd2/milian/projects/qt5/src/qtwebchannel/build/tests/auto/webchannel/tst_webchannel) ==840094== by 0x1298BB: TestObject::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (in /ssd2/milian/projects/qt5/src/qtwebchannel/build/tests/auto/webchannel/tst_webchannel) ==840094== by 0x5183FEC: QMetaCallEvent::placeMetaCall(QObject*) (qobject.cpp:520) ==840094== by 0x5184FFB: QObject::event(QEvent*) (qobject.cpp:1260) ==840094== by 0x513F8D7: QCoreApplicationPrivate::notify_helper(QObject*, QEvent*) (qcoreapplication.cpp:1256) ==840094== ==840094== This conflicts with a previous read of size 4 by thread #1 ==840094== Locks held: none ==840094== at 0x1213FF: TestWebChannel::testAsyncObject() (in /ssd2/milian/projects/qt5/src/qtwebchannel/build/tests/auto/webchannel/tst_webchannel) ==840094== by 0x128E03: TestWebChannel::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (in /ssd2/milian/projects/qt5/src/qtwebchannel/build/tests/auto/webchannel/tst_webchannel) ==840094== by 0x514D345: QMetaMethod::invoke(QObject*, Qt::ConnectionType, QGenericReturnArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument) const (qmetaobject.cpp:2308) ==840094== by 0x4DBE6E2: QMetaMethod::invoke(QObject*, Qt::ConnectionType, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument) const (qmetaobject.h:122) ==840094== by 0x4DB735A: QTest::TestMethods::invokeTestOnData(int) const (qtestcase.cpp:941) ==840094== by 0x4DB7EA8: QTest::TestMethods::invokeTest(int, char const*, QTest::WatchDog*) const (qtestcase.cpp:1140) ==840094== by 0x4DB92DE: QTest::TestMethods::invokeTests(QObject*) const (qtestcase.cpp:1484) ==840094== by 0x4DB9F3F: QTest::qRun() (qtestcase.cpp:1922) ==840094== Address 0x1ffeffd160 is on thread #1's stack ==840094== in frame #3, created by TestWebChannel::testAsyncObject() (???:) ``` Change-Id: Ie0d18e1d7ec970fd7fb46a5ef10699d239008f53 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* | Restore compatibility with custom QVariantList/QVariantMap convertersMilian Wolff2020-04-153-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QVariant::toValue<QVariantList> does not honor explicit custom converters for a sequentially iterable container to a QVariantList. This breaks compatibility with Qt 5.12.3 and before, where the old code path using QVariant::toList() used the custom converter. Do the same for QVariantMap. This patch restores the compatibility with old code. The real fix will target the QVariantList converter code in QtCore - this is just a hotfix within Qt WebChannel for now. Task-number: QTBUG-80751 Change-Id: Ic70c6a353aad43ddbaefbc6626a0af87bd0d024f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Update plugins.qmltypes for 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Jani Heikkinen2020-02-251-1/+1
| | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: I35086c430e4ba87242b2e90c8359ce2fad54e553 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I716d1fb804284a0e9d7ca6b7fd46332037b28f69
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: Iaf712608e1c272d5718eb2d3a410c24daeb422c8
* | Fix documentation to use commonly working syntax for property changesMilian Wolff2020-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The "on" prefix and capitalization of the first letter in the change signal name is only done in QML, not in JavaScript. Furthermore, not all notify signals carry the new value in their signature. Adapt the example code to not show the "on" prefix and also use the more reliable approach to read a property value directly. Task-number: QTBUG-81782 Change-Id: I9c25e48c2d7abcdabbca88526f62c3d79eb952f8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\ \ | |/ | | | | Change-Id: If2d71d63dd7515f14f68b6835a78bb67d2146a75
| * 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-111-1/+1
|\ \ | |/ | | | | Change-Id: I07be735a13acfd0f85378916fa2992c921f0dacd
| * 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-0/+6541
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I453cd1af0fcae0b61fee02202513c28354acf0c4
| * 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' into 5.15Qt Forward Merge Bot2019-12-142-0/+33
|\ \ | |/ | | | | Change-Id: I4af9cf36594aeed95740bd49b749e041a28cdcec
| * 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>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-233-35/+29
|\ \ \ | |/ / | | | | | | Change-Id: Iea2856ddca7885742d2f52352ecf9d996937b35f
| * | 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>
View Lorry Controller Status