summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on '6.4' in qt/qtwebchannelQt Submodule Update Bot2022-06-081-3/+3
| | | | | Change-Id: I03ee9cccbe7786c5eafb8452c9d9a2bc083d4152 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-05-311-3/+3
| | | | | Change-Id: Ic98306e2e5118aae81e1185c3c3f63afa9f2c88a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-05-271-3/+3
| | | | | Change-Id: Ib74d327eddb144c71e58d44cebdf1c5947a13c96 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-05-241-3/+3
| | | | | Change-Id: I02742150414379864d18702afd5bcb1e5cc15c3a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Move qml test data to correct locationAssam Boudjelthia2022-05-186-1/+1
| | | | | | | | | | | | | The qml test data in CMakeLists.txt is expected to be under data folder but the qml files are put directly under the test project root dir and thus they're not packaged. Pick-to: 6.2 6.3 Task-number: QTBUG-88846 Change-Id: Ib9eb022d95c193aafc3718902e1aed9dd8d743f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-05-181-3/+3
| | | | | Change-Id: I3d6fbb47234797be3009eabb80a3db623b82dbe7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix missing includesVille Voutilainen2022-05-171-0/+1
| | | | | | | | There's been recent header refactorings, this fixes the fallout. Pick-to: 6.3 6.2 Change-Id: I632f652ed12e151af6d1ad09c3ace510f60747ab Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-05-161-3/+3
| | | | | Change-Id: Ifb0ce670e031c502a91ae9f7708d17b20ed74e46 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-05-121-3/+3
| | | | | Change-Id: I5e31ae6671cb4a238c065c458d7e7ad63cf2df22 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-05-111-3/+3
| | | | | Change-Id: I18bdb81cc6ec9350caea01fc6a68422ba37ed335 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Enable documentation testing in CITopi Reinio2022-05-092-4/+8
| | | | | | | | | | | And fix issues with the documentation config; Replace obsolete selectors with up-to-date ones and add a dependency to qtcmake to make linking to CMake manual work. Pick-to: 6.3 Change-Id: I964fd21b252af4b9ae034de9be84fafc32b80646 Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-05-051-3/+3
| | | | | Change-Id: I22e34fad392d5acbc1f5bbbbe7bf35bc0c3b10de Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-04-281-3/+3
| | | | | Change-Id: I4f0662dd72a5c319771b13ea010dcfb0675f8506 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-04-191-3/+3
| | | | | Change-Id: I084483e8ce6b657e08b3310934ce76409c3de943 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-04-011-3/+3
| | | | | Change-Id: Ia5d4601c9917e5e9481949cf262a2cedc5fbd2a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Blacklist: test cases blacklisted in qml:"Pasi Petäjäjärvi2022-04-011-13/+0
| | | | | | | | | | This reverts commit 93c9222095f8582059cffef0c0d025c4b5ab118b. Reason for revert: Fixed in aec6b0075863bff181d1d3dfdf1399264de01f67 Task-number: QTBUG-101521 Change-Id: I74a6ccc6b6520d704fbf02f0f1735f3b28b6fe15 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-03-311-3/+3
| | | | | Change-Id: I49db994c0e2eca5ee300b0b7d3a00500bd4bd9cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-03-301-3/+3
| | | | | Change-Id: I7004cec7a4199e66ed32ae2920a8a07bddd32657 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revise Qt Web Channel module landing pageAndreas Eliasson2022-03-281-35/+34
| | | | | | | | | | Remove the include directive section and add global CMake and qmake snippets. Also, reorganize some of the sections structure. Task-number: QTBUG-100369 Pick-to: 6.3 6.3.0 Change-Id: I6af1a2e4a9e77a1ae7a2a3a5d515929683ea26da Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-03-241-3/+3
| | | | | Change-Id: Ib01a21bca7094b2a4969da8a00cb5516e3cb402b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-227-169/+0
| | | | | | Pick-to: 6.3 Change-Id: I78d6a6b2d245743f1cce18955ed3fc05a054f9fa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-03-211-3/+3
| | | | | Change-Id: I30c79bdd46b0ca3da35dd09d92c9a40e570b7d0d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make sure all private headers include at least one otherThiago Macieira2022-03-083-1/+4
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-03-081-3/+3
| | | | | Change-Id: I6be8a6abc316fcd846475b1a8bb783d0b3beceb4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Blacklist: test cases blacklisted in qml:CI Insignificant Platforms Monitor Bot2022-03-071-0/+13
| | | | | | | | | | | | | - tst_multiclient::compile on qnx - tst_bench::compile on qnx - tst_webchannel::compile on qnx - tst_webchannelseparation::compile on qnx Pick-to: 6.2 Pick-to: 6.3 Task-number: QTBUG-101521 Change-Id: Ic2c81a883140f79d4e6fdb2c55e13788cef1cd74 Reviewed-by: CI Insignificant Platforms Monitor Bot <ci_insignificant_platforms_monitor_bot@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-03-051-3/+3
| | | | | Change-Id: I5e39d4afdf01f158f097d13a56fb11ec7de3ee1f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-02-281-2/+2
| | | | | Change-Id: I42379a79be86104d8942e096a6bcb7a3b2f4421d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-02-251-3/+3
| | | | | Change-Id: If0ea165ac1da5f3a71723d1ec99987f2a67d89b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Improve examples CMakeLists.txtKai Köhne2022-02-174-31/+12
| | | | | | | | | | | | | | | | | | - Remove "# generated from xyz.pro" comment from pro2cmake - Remove "# special case" comments - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: I213a18f08c12e5b2354f02be0ec64bc022bfb23c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-02-161-3/+3
| | | | | Change-Id: Ib7585daa158d0d7d18df7d29e43e6a9dca7ec0cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not highlight the WebChannel Standalone Example anymore in Qt CreatorZhang Hao2022-02-161-2/+0
| | | | | | | | Pick-to: 6.3 Fixes: QTBUG-100650 Change-Id: I65b565bedee9107b0d348446c9fc3c00509db058 Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Arno Rehn <a.rehn@menlosystems.com>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-02-121-3/+3
| | | | | Change-Id: I0584d05d23ce1d8c949e79f22646fdb65dc9268d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-02-051-3/+3
| | | | | Change-Id: Ic89ecdccf1767c36703923de1fa093e0a2e742e7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Switch examples to build as isolated sub-builds part 2Alexandru Croitor2022-02-051-1/+1
| | | | | | | | | | | | | | | qt_examples_build_begin needs the EXTERNAL_BUILD flag to know that it's safe to build examples as ExternalProjects. It still won't do it in CI until we enable building examples as ExternalProjects for prefix builds. This is preparation for that. Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: Iac796ee2dc02215bfe71bddf5931af09426cc47f Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Bump version to 6.4.0Jani Heikkinen2022-02-011-1/+1
| | | | | Change-Id: Ib375ded7b36f0b82771e4fbe3ef7fb3a38f4e319 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-02-011-3/+3
| | | | | Change-Id: I1d80e16cd4ddf8b36e5e32f303e077e6705616cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-01-251-3/+3
| | | | | Change-Id: I6988fc52939640899c4a0e88c66044505825188b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove unused .qrc fileJoerg Bornemann2022-01-181-5/+0
| | | | | | | Task-number: QTBUG-94446 Change-Id: I0d1410bb1664be33c431229975d9ca9673077acb 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-01-171-3/+3
| | | | | Change-Id: I1b452fc4cd7c44b6246a5122ae7c604afea3ab0e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2022-01-131-3/+3
| | | | | Change-Id: Ie0ddef9dfdd363ee079a48f9438586eb89238942 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Re-enable cmake build test for qtwebchannelJuha Vuolle2022-01-112-14/+35
| | | | | | | Task-number: QTBUG-92967 Pick-to: 6.2 6.3 Change-Id: Ie104331b7dd375fae3b448de7767550ffb9f4c29 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2021-12-161-3/+3
| | | | | Change-Id: Ib81be0957c748cf359aae8f03c0810daf88998fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-151-6/+6
| | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: If6e6713058cfd4f7940e99261eca658ddb604b36 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* QMetaObjectPublisher: Never send stale queued messagesArno Rehn2021-12-141-3/+15
| | | | | | | | | | | | | | | | | | | If the client is connected with an in-process transport, it can happen that a transmitted message triggers a subsequent property change. In that case, we need to ensure that the queued messages have already been cleared; otherwise the recursive call will send everythig again. Case in point: The qmlwebchannel tests fail if we don't clear the queued messages before sending them out. For that same reason set the client to "busy" (aka non-idle) just right before sending out the messages; otherwise a potential "Idle" type message will not correctly restore the Idle state. Pick-to: 6.2 Pick-to: 6.3 Change-Id: Idc4afdd5cf4b4e03b8de8953a03d28442d74a3ab Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Enforce ctest exit code in the CI by switching to new COIN configArno Rehn2021-12-141-1/+1
| | | | | | | Pick-to: 6.2 Pick-to: 6.3 Change-Id: I00b68bc109e52680531e30b6f1ed7681b1761ad2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2021-12-121-3/+3
| | | | | Change-Id: If52ee2341cadee4f81ac9829739e682dbaa19c45 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2021-12-111-3/+3
| | | | | Change-Id: I25cafcb4a8635b60e5e10717de00963f93eb641d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2021-12-091-3/+3
| | | | | Change-Id: Iff1b62c853560d870501df84bc32bfb93bb6659c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2021-12-061-3/+3
| | | | | Change-Id: I126c39da62ffd29ba1f67b0a994aecd7dfed74ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebchannelQt Submodule Update Bot2021-12-031-3/+3
| | | | | Change-Id: Id863bd9be2516894f94a51b8ca7f5e76f07fab51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>