summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.15.1v5.15.15.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 Pick-to: dev 5.15 Change-Id: Iac45ea16798cc4735add87e4ac681193d8a9e7a6 Reviewed-by: Jani Heikkinen <jani.heikkinen@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>
| * 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.14' into 5.15Qt Forward Merge Bot2019-11-121-0/+20
|\ \ | |/ | | | | Change-Id: If46418509b9e764ed935780ee7c7dfbb73cd9530
| * 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
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-011-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I99db0266ee090a9f25768a10342ebf8adce2a570
| * | 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.14' into 5.15"Qt Forward Merge Bot2019-09-215-0/+6553
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-215-0/+6553
| |\ \ \ |/ / / / | | _ / | | / Change-Id: Ia35db6d41c52a8f7e786377a4d7cb165d6830a4c
| * | 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
View Lorry Controller Status