summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtwebchannelHEADdevQt Submodule Update Bot2023-05-171-3/+3
| | | | | Change-Id: I63b98207dc30877fa4c3e56186f23eec613f256b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-05-111-3/+3
| | | | | Change-Id: Ie3eb5d9927d12c9a646d1036dea8c6c877ab169a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-05-101-3/+3
| | | | | Change-Id: Ia61bd53db1183c4117b83ecde385b5566636b544 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add the use of the qt_internal_project_setup functionAlexey Edelev2023-05-031-0/+1
| | | | | | | | | The function sets the required CMake variables and policies. Pick-to: 6.5 Task-number: QTBUG-112685 Change-Id: I9e903e87fa2adf0eb884df5c6e2e369c9d373d35 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-05-021-3/+3
| | | | | Change-Id: I0ea6744e646ba335bbb4527228efc596e47e588b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-04-271-3/+3
| | | | | Change-Id: I16d987563f6187a3b6dc08aacd2a9c1c8f2f85e7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-04-241-3/+3
| | | | | Change-Id: I38392c0cfe30d2d4830312d5e697a44e6ff94079 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-04-201-3/+3
| | | | | Change-Id: I12268cae9dddfc09c0389bc10edab2de432ac1f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-04-191-2/+2
| | | | | Change-Id: I2140111533745818c2b3c8c86dfe207c21940818 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-04-181-3/+3
| | | | | Change-Id: Ice462ba646c2c64a2859fd9aebbabee0b9183907 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-04-131-3/+3
| | | | | Change-Id: I0b5ed467ec54fbd9e26afebcb47f5dff012946a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-04-121-3/+3
| | | | | Change-Id: I4d0eb4fe1b5ef68609e09dcd5dd28ccdf0f56bdc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not use deprecated QtFuture::makeReadyFuture()Ivan Solovev2023-04-111-3/+3
| | | | | | Task-number: QTBUG-109677 Change-Id: I09d78b3479978878fc98aca6bbc6e1316001a912 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-04-111-3/+3
| | | | | Change-Id: I3bfa9cb80c437c08a8161ffedb420e0de7574762 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-04-041-3/+3
| | | | | Change-Id: I05e59a92010a928700b8eb5f6ce3d5c721fccba9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-03-281-3/+3
| | | | | Change-Id: Ic52d90ac140cb96a870631cd2940b3061c12e7fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add Axivion configMatti Paaso2023-03-241-0/+60
| | | | | | | Task-number: QTQAINFRA-5244 Change-Id: I186a84faa18dd21a4b28116b3c5abd2e20792b05 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-03-201-3/+3
| | | | | Change-Id: Ifb3a9559958ae3dcf422b37d5e9df6a26d18812c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-03-111-3/+3
| | | | | Change-Id: I272ff3c99e3476facfb7a6214e164523acf6db92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-03-031-3/+3
| | | | | Change-Id: I9cbb2cd8815b0a053dea6c5e523c1f64066dce2f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-02-241-3/+3
| | | | | Change-Id: Iabcbc3a315e7469dfccc02f8ea4d36130b4dbcdc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-02-211-3/+3
| | | | | Change-Id: I7a1e21ff0f5aea8a92292fcd17ca1062daa18fbe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Improve backward supportAllan Sandfeld Jensen2023-02-143-7/+33
| | | | | | | Do both variant conversions and qjsonvalue conversions. Change-Id: I655395aa64c83ef62e8062d0820fdff437ebb156 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-02-131-3/+3
| | | | | Change-Id: I3f95c5bc2631d9ac0b74a8b62716ddb4c73041bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add server-side support for custom convertersArno Rehn2023-02-094-18/+76
| | | | | | | | | Automatically tries to convert server-side values to/from QJsonValue. Carries on as usual when the conversion fails. Fixes: QTBUG-92902 Change-Id: I89ae7c3bc8490223c9fab41ca513d9277483692e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix project structure and auto registryMichal Klocek2023-02-0322-276/+105
| | | | | | | | | | | | | | | | | | | Create QtWebChannelQuick and move the required sources, so auto registry works and qml types files and friends are auto generated. This makes things inline what other modules do. This change has a side effect as qqmlwebchannel.h will change its module, however this is semi-pulibc header, hopefully only used by QtWebEngine. [ChangeLog] Created new QtWebChannelQuick which holds qml sources. Task-number: QTBUG-110795 Fixes: QTBUG-99959 Change-Id: Ic8aa72f070d6a9e23d918a1210f4df62df739397 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-02-021-3/+3
| | | | | Change-Id: I12972040932206b7bf8c6948af4c01d9b9884a4f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-02-011-3/+3
| | | | | Change-Id: I228858f6fff8a90351fa85b283ed93550846ca36 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-01-201-3/+3
| | | | | Change-Id: I4f164de8e6eab21b199a16a7e6c136b8f30e8f8d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-01-171-3/+3
| | | | | Change-Id: I6b4ff65e62126a74a769e81b15f44a83cd4c2106 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-01-121-3/+3
| | | | | Change-Id: Ibc690b2ba10962f0065110ea5980243772d83c3b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-01-091-3/+3
| | | | | Change-Id: Ia9dcf637e8a7e743bec625031a979f784419ff82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-01-041-3/+3
| | | | | Change-Id: I6dcb34da3b08990bc84c4ccb3c6ee4b5b8e3b8c8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2023-01-031-3/+3
| | | | | Change-Id: Ic3973cca83c1aff3a4ea7998ab6b92ab3aa2594b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove QT_USE_SYNCQT_CPPAlexey Edelev2023-01-021-2/+0
| | | | | | | | Option has not effect anymore. Pick-to: 6.5 Change-Id: Ibff8d29464fa09a293b5c1206d570c49a88ce65c Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* SignalHandler: optimize remove(QObject*)Marc Mutz2022-12-251-5/+5
| | | | | | | | | | | | | | | | | | | Don't look up the object in m_connectionCounter three times (contains(), value(), remove()). Instead, use find() to find it once, and std::move(it.value()) + erase() as a take() that can report whether the element existed in the container prior to extraction. This also means we can port the foreach loop to a ranged for loop now without hesitation: by erasing the element from the container before iterating over the QObject::disconnect() calls, we ensure immunity against a potential reentrance into the object (disconnectNotify() calls unknown code) that changes m_connectionsCounter, which the foreach loop was immune against (d/t taking a copy of the container under iteration). Change-Id: I6cf36c729f488bf1334fd344ddd0191db101d103 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Arno Rehn <a.rehn@menlosystems.com>
* tst_webchannel: port from raw and shared pointers to unique_ptrMarc Mutz2022-12-251-12/+14
| | | | | | | | | | | | | | Avoids the need for qDeleteAll() in the case of raw pointers. Avoids overhead for non-shared objects in the shared pointer case. Since unique_ptr is a move-only type, use a container (std::vector) and loop constuct (ranged for loop) that can handle it. This removes the only use of QSharedPointer in this module. Change-Id: Ic3fe90403eb3f28f1e2e370a3648bc522880a10d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Arno Rehn <a.rehn@menlosystems.com>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-12-211-3/+3
| | | | | Change-Id: Ic26b1f1a7f114280a436c3fe87d7f8f1257ae21a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.0Jani Heikkinen2022-12-161-1/+1
| | | | | Change-Id: I57fb11ab0e94e5d841c815d915ea96c2b3bc595d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-12-161-3/+3
| | | | | Change-Id: Ia0560c82e7ec219044ce820afc900302e74323c8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-12-121-3/+3
| | | | | Change-Id: I1e43efd932fd98ec7e430b5eb7dced5b12215e81 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-12-081-3/+3
| | | | | Change-Id: I40da23b9769d1b9b32132b6da914f82b5111d5d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Mark the module free of qAsConst()Marc Mutz2022-12-051-0/+1
| | | | | Change-Id: I914ccc09297ac6283d7cf24d5afc96ebdaf294d0 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-12-051-3/+3
| | | | | Change-Id: Ic82c6a3b4a67dcecd4a5ca173574c2d8faea35ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-11-291-2/+2
| | | | | Change-Id: I00b9f7ef21e426dccaef2a6a0a1a2bcd50912afd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-11-261-3/+3
| | | | | Change-Id: I94a60f3e01153b8932a2ffdc869b47f574051f69 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-11-261-3/+3
| | | | | Change-Id: I732c8de0b127e2a0efb9a9fa76505397896fa48f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-11-171-3/+3
| | | | | Change-Id: I56d0a549f19661fdb9810ab76b97a22af089731b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-11-161-3/+3
| | | | | Change-Id: I8ab6f67a69d5cd99450ecca2f2af59d422e1a9b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-11-141-3/+3
| | | | | Change-Id: I9daeadbed7e40255350166a1b54f5a60657b6605 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>