summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QtRemoteObjectsQml: remove dependency from unused private header6.3Sona Kurazyan2022-08-292-2/+0
| | | | | | | | | | | | | qjsvalue_p.h is included, but not used, so remove the unneeded include and dependency from QmlPrivate. Fixes: QTBUG-106003 Change-Id: I161fd0bafb11af0e21778b0c9db3ada72f7bba80 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> (cherry picked from commit cd67b4351eb3e64d242b939ef4e5f85b5b07e6c2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* repc: Fix warning in generated codeDominik Holland2022-08-271-3/+9
| | | | | | | | | | | | This ammends acd888220b9d600fe057249d43bd3934ae0cbad5 and adds the same check to three other methods as well. Fixes: QTBUG-97790 Change-Id: Iecad6dbd1b99842a2c8802af2d973f9eb986d81e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 288859e96ccc1bc733ebd7924d3ce36f4f01d24f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-08-231-2/+2
| | | | | Change-Id: I4b3adb819002df36decf85c0c6749f0dd4853f29 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-08-221-2/+2
| | | | | Change-Id: I017fbd22ba414c48bffe2d632d82df92aee2ab60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-08-191-2/+2
| | | | | Change-Id: Ief8d07840552b72c39c1db6d159991b56a4853a2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.3.3Jani Heikkinen2022-08-191-1/+1
| | | | | Change-Id: I947c5acafdddbb9c15e301a35214edbb6a1b08b4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_restart: add -nocrashhandler option for ServerRestartFatal modeSona Kurazyan2022-08-161-2/+4
| | | | | | | | | | | | | In ServerRestartFatal mode the server is expected to crash, so add the -nocrashhandler to disable the crash handler. It seems like on macOS 10.14 it causes the server process to hang on exit. Fixes: QTBUG-105597 Change-Id: I8bf2446b4964a8c5dfaa8edb562b8943116b8989 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 02adc13564fdddfff6d01729136365b0778515f9) Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-08-111-2/+2
| | | | | Change-Id: I7d61cb0ea213e56acdb33171e6f3071c07ac46d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-08-091-2/+2
| | | | | Change-Id: Ibd0b6f82a484938c6644299643526a6dcccc9df8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-08-021-2/+2
| | | | | Change-Id: I81133e45d578c7d7ada17b7eead87504d7721c1d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* repc: Fix warning in generated codeDominik Holland2022-07-281-3/+9
| | | | | | | | | | | | | | | | Check the array bounds using sizeof before access to make the compiler happy. Otherwise the following warning is generated: warning: array subscript 1 is above array bounds of ‘const int [1]’ [-Warray-bounds] Fixes: QTBUG-97790 Change-Id: I52b36b065b9f62188e5bfc157081650ca3ee159e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit acd888220b9d600fe057249d43bd3934ae0cbad5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Rename tst_signature test to avoid conflict in top-level buildsAlexandru Croitor2022-07-281-1/+1
| | | | | | | | | It conflicts with qtapplicationmanager repo tst_signature Change-Id: I4f3108dbf86d3c668d75e97d7640dd277ca61157 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 55d6e3a8d92f42a33cc6f798f1fc957ff5b9fdf7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-07-251-2/+2
| | | | | Change-Id: Ie7cfc522f865a9e958ffac38af3f5d76ac213b3c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-07-221-2/+2
| | | | | Change-Id: Iad00d948b02f3059199d6cd629de615fcc33c60b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-07-201-2/+2
| | | | | Change-Id: Icad90ae8c1087182c75dff4c0675277cd9707b57 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-07-191-2/+2
| | | | | Change-Id: I4c3f2217edc39e9b0b140a0973b34dbe1d1a27db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-07-151-2/+2
| | | | | Change-Id: I52db8be1591eab48da98a998f7c9e62ab8bdd1fb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: use different port than 5555 for tst_modelreplicatestAssam Boudjelthia2022-07-141-8/+8
| | | | | | | | | | | | because that port is used by adbd on Android 12, where as adbd is using 5037 on Android 6 which is currently the CI default. Now, trying to add Android 12 to CI this test fails. Change-Id: I860f4dc4fca0c8df525069209a80b6b5ce4e15ae Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 41cf29b2d1ffda38ac1477fd355fe14c4cc13f50) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-07-071-2/+2
| | | | | Change-Id: I150e6bdc90fc99b34df504778b29cf54e2072e10 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-07-061-2/+2
| | | | | Change-Id: I15cf95bd32b2ae75326d633ecf0955aa7d9c3eaa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix race condition when accessing invalid indexElias Steurer2022-07-051-1/+4
| | | | | | | | | | | | | This can sometimes happen when clicking fast on different items in debug mode. This this is a fix by Roman Putintsev. [ChangeLog][QtRemoteObjects][ModelReplica] Fix race condition when accessing invalid index Fixes: QTBUG-74124 Change-Id: Ice95b4f91b50173ce804f3d664e9b12a4c74e1ce Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit e96d2a9907adfefb6318d3085c55b8cfb6e44638) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-06-271-2/+2
| | | | | Change-Id: I76ff9f809f546797697d821d051f2af3a4c82932 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix compilation without QmlSona Kurazyan2022-06-221-1/+1
| | | | | | | | | | | | | | | QuickTestUtilsPrivate is only required for tst_usertypes, which is not compiled when Qml library isn't available, so make QuickTestUtilsPrivate optional. This patch amends c41500bd488b708473da758e04deb57c033d56cc. Change-Id: I890f98c758c6a787dab3676750813ec5a4685b96 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 4ae71ddefd5957e0c75cc8ee63d8b93ef8c37424) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-06-211-2/+2
| | | | | Change-Id: I30a911c77cb71126a8374b407f7103bf484ee00c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix typo in debug outputKai Köhne2022-06-201-2/+3
| | | | | | | | | | s/paremeters/parameters Task-number: QTBUG-97092 Change-Id: I7f3e306f5899e4834aadc4ab142f1532652fedf3 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 6fe17af4c04567ebd013282dbe0eff1542de7546) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.3.2Jani Heikkinen2022-06-161-1/+1
| | | | | Change-Id: I3e355b084bf9334a878a686e8aea4312bda25c0b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-06-151-2/+2
| | | | | Change-Id: I0b7fd10e6aa812c247362db80c2d7e59f61945e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_restart: increase waiting timeout in testSona Kurazyan2022-06-101-1/+1
| | | | | | | | | | | Targeting to 6.4 directly, as this is a release blocker. Will pick to 6.2 and 5.15 manually. Fixes: QTBUG-104098 Change-Id: I4c452cd7a5b36a54e4fcc52afecbb930be9827f1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 0f6ec405cf7d4dcc1adf4c8947d78417de69a5ee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-06-031-2/+2
| | | | | Change-Id: I95e62e3e6175ac5c3f62fc01826acd59529b6525 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-05-311-2/+2
| | | | | Change-Id: Id213248ceaf256cfb0f3763b146b511c786e6d38 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-05-271-2/+2
| | | | | Change-Id: I884672cecb6a485c6b0f5e275554d44042fddd21 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-05-251-2/+2
| | | | | Change-Id: I060ce3c818db385e232e56be427331d9f09cf0b9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Empty pre-release version in '6.3' seriesJani Heikkinen2022-05-251-1/+1
| | | | | Change-Id: I7b407f0fe183f14ea1752c64b2250b48ceaf6c9a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* prevent undefined behavior of using underscore & upper case identifierMoody Liu2022-05-201-60/+84
| | | | | | | | | | | also, the macro _Bool from stdbool.h was included by the commit 56dcb3b49643216e25863af5d18883396654f840 in qtbase, so rename the function here to prevent name clashes Change-Id: I74645678f2261ca263efc914212b842973db2f47 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 796e4eb077ca6ec015aa914bbbe7f4b79b686153) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-05-191-2/+2
| | | | | Change-Id: I957963ba76f597204e075fe2b721c3af5023fba0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Use find_package(Qt6 REQUIRED COMPONENTS ...) idiomKai Köhne2022-05-131-1/+1
| | | | | | | | | | | | Using REQUIRED as a prefix instead of suffix works better with OPTIONAL_COMPONENTS, and is also the order in the CMake manual. Task-number: QTBUG-98867 Change-Id: I02034035f8c67a1e55a826898231409c07ebd6bf Reviewed-by: Rui Oliveira Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 6843593ff41a90941c7ffd50db028c155d6e3418) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-05-121-2/+2
| | | | | Change-Id: I311684e36d8669fc16f0e6cfde1923ac3d42d8c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-05-091-2/+2
| | | | | Change-Id: Ie5ba3c708af34e0d8f02516138dc17ad57ce309b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix tst_usertypes resources bundlingAssam Boudjelthia2022-04-294-17/+42
| | | | | | | | | | | | | | Bundle the test resources in the android and INTEGRITY package otherwise the test cannot possibly find it at runtime. Task-number: QTBUG-100449 Task-number: QTBUG-99123 Fixes: QTBUG-102852 Change-Id: I3d97177be9706ae1dcff0083640df3d587835c09 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io> (cherry picked from commit c41500bd488b708473da758e04deb57c033d56cc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: use localabstract socket on Android testsAssam Boudjelthia2022-04-2919-36/+66
| | | | | | | | | | Replace usage of local socket with localabstract for Android. Task-number: QTBUG-100449 Change-Id: Ia15090b15fb2784fa9747e4568ca3ab0ebf885bd Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit da527fcbdb15463ad4bacccf7c8b2252c7417e7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't run rep_from_header test when cross-compilingAssam Boudjelthia2022-04-281-1/+3
| | | | | | | | | | | | rep_from_header test is testing the replica files which makes it useful to run only for host. Task-number: QTBUG-100449 Change-Id: Iac528f2c3e26cea5bd29ba3e273ef05b70ca87dd Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 24cee6084e17e58e7d6ef0b5b1364fd89884edd5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-04-281-2/+2
| | | | | Change-Id: Iac175c99604c40917a0ee5fb3cab144fe4151618 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: skip tests that require running test helpers with QProcessAssam Boudjelthia2022-04-277-0/+22
| | | | | | | | | | | QProcess does not support executing custom bundled binaries from the apk, so such tests will fail, so they need to be skipped. Task-number: QTBUG-100449 Change-Id: I54b2374db25154074ce75364a7359a637ddcae98 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 3144315fe7cf08620f3ac95aedffffcf9ed28499) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: always succeed with TestUtils::init()Assam Boudjelthia2022-04-271-0/+6
| | | | | | | | | | | Android has all the libraries packaged under the native libs folder, so the checks done under init() don't apply. Task-number: QTBUG-100449 Change-Id: I266230d361df52e446f9e8036cd70863f3a44dab Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 4cb781627adb6aff9ad40a55ced2766095b7c7a9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-04-201-2/+2
| | | | | Change-Id: I2d1182fe1074079c9fa253ced22b3c8016ae8904 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-04-191-2/+2
| | | | | Change-Id: If0eba2d5cb4f6330f5b55567a53e4b8d10681beb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-04-181-2/+2
| | | | | Change-Id: I288bbb9f06129499c139afb58be3827ae9bbc9ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-04-141-2/+2
| | | | | Change-Id: I034919caf00b7e0e6fe1627b2fa4d89eb57dbb22 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-04-081-2/+2
| | | | | Change-Id: Ie1cec85fad85323cc3a3e60d16c8258f27949cb8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtremoteobjectsQt Submodule Update Bot2022-04-061-2/+2
| | | | | Change-Id: I38197ac47237036de73c2172687494a684ea1e40 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>