summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix a potential crash when trying to start applications6.3Robert Griebl2022-10-122-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | If you were calling startApplication() and the runtime failed to execute the app's binary in a container, it would call deleteLater() on the failed runtime object. The problem was that if you immediately called startApplication() once more in the same event loop iteration, the Application object still had the to-be-deleted runtime attached, which in turn prevents the allocation of a new container, so the AM tried to start the application again, but this time with "container" set to nullptr. The actual fix is to NOT call deleteLater, but directly delete the runtime object. In addition, when startApplication() is called for an application, we have to make sure that the application's runtime object can not be in the state NotRunning: the AM could still end up in this state, if a Container plugin is either not reporting shutdown correctly, or if the container's "ready" state is delayed. Change-Id: Ied1baec8c90d4e0a980c296cbc7cd87b12629524 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 5ae261864728678df3dd72f156efc6688dcf695d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix a few documentation inconsistenciesRobert Griebl2022-09-275-7/+11
| | | | | | | Change-Id: I33b43f1af4f052ef70fdad80b6abf8cec91f5930 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 81b9b03ac7f302f87bbeea61c03678167e3f5ef3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix appman-qmltestrunner initializationDominik Holland2022-09-011-1/+0
| | | | | | | | | | | | Don't call QTestRootObject::init() before starting the test. This causes all variables to be reset, including hasTestCase and causes the event loop not to be started. Fixes: QTBUG-106088 Change-Id: Idaa114efaed1a306aca3affd6f255d918f1a6d29 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 06c4cb084376d93875aaf3d14600055a17cf8b83) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-08-231-4/+4
| | | | | Change-Id: I6dc391d93e1c6e622b1a1fb1d23bec07e28298e7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-08-221-4/+4
| | | | | Change-Id: I5ec47c9ab21ecfb7fb83785731abfddbdc733809 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: I2df78ab9cbf0c14b6ffa5b21b552d7c74f54a6ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-08-191-4/+4
| | | | | Change-Id: Iac9f7d105f6be114dcd545d344007cc032d9e244 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix the internal IntentHandler map getting corrupted on closing appsRobert Griebl2022-08-181-3/+1
| | | | | | | | | | | | | | | | std::remove_if() on a QMap should result in a compile-time error, but it somehow doesn't. Instead the erase(remove_if()) algorithm leaves a corrupted QMap. This is especially noticeable in single-process mode, where the wrong intent handlers are being called after closing any single application, which registered IntentHandlers before. This bug was introduced while fixing clazy warnings. Change-Id: I144c051591ce8564e2653402d12bb926ef32eb76 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 4507e6f17c640d9e044a4b87ea4b84dda3c5b8ad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-08-111-4/+4
| | | | | Change-Id: Ief127ab91ca8471e61ea5070789f04128b65ed61 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-08-091-4/+4
| | | | | Change-Id: Ia5b45cf7fe4b96f7875976e4f2cb63ec781e327f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix setting the Material style in the Intents exampleRobert Griebl2022-08-072-2/+2
| | | | | | | Change-Id: Ib4e94bebdd2b2416a9ed6a5fc21e357223ab36fb Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 6448f72561db8d176c938c2a2957dc242ede8a4b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Intents: prevent a crash if a sent request is gc'ed too earlyRobert Griebl2022-08-053-3/+15
| | | | | | | | | | | | Not saving the result of IntentClient.sendIntentRequest could lead to the GC deleting the IntentClientRequest before it was even delivered to the receiver, leaving a dangling pointer. Change-Id: I8972795d166fa46dd736005dd4df33b9a7ea2463 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit bb186192373c6ff796c9084f22d48b02d14886c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-08-021-4/+4
| | | | | Change-Id: I738a0c50083b0862ff436eaa737d44a2c4b16947 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix DBus error handling when set to "auto"Robert Griebl2022-08-022-7/+29
| | | | | | | | | | | | | | | | | | | | | | Problem 1: A Qt plugin calls QDBusConnection::sessionBus() before we fork off our own, private session bus. In this case, Qt caches the old bus address and we try to register our objects on the wrong bus. -> register on our own bus explicitly. Problem 2: If "Problem 1" happened, every QML application would block for 100 * ~25sec on startup, trying to call "Introspect" on the non- existing Notification interface (on the wrong dbus). The delay loop was written for the P2P case, which doesn't block in the QDBusInterface constructor, resulting in a more reasonable 100 * 1msec timeout. -> check if the service is available at all first and also check for time-elapsed instead of trying 100 times. Change-Id: I34ade2bee2da27753eda09b6c0f3562882f40bc3 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 6ffa6c7fa98336be9edc83e06f0c9ddad3769550) Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-07-251-4/+4
| | | | | Change-Id: Ic938e4873a3446f925c74261c1a27f9083a5fff6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-07-221-4/+4
| | | | | Change-Id: I043ce09d429a2fd2e8e4fb95a3f472968b9e831f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-07-201-4/+4
| | | | | Change-Id: Ie851f17c16032e084d3e9b42acf66a5931c0ae1c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-07-191-4/+4
| | | | | Change-Id: Ic84c71cd3e3d70e17bb8651ff1b717e00e8e0ffe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-07-151-4/+4
| | | | | Change-Id: I4482575752f8251c7f7aa368b3c7b7cc430c681b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Some tests cannot be built for AndroidRobert Griebl2022-07-152-3/+5
| | | | | | | Change-Id: Ie97dd699e49119514652ca9d97ba7de80a90a544 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 7713f49ebb04f678a81b0c7cfcacd0880bd2661c) Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-07-071-4/+4
| | | | | Change-Id: Ie7ebe30f3a32ba726b6cd0ee2fa0ca0960ca752a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-07-061-4/+4
| | | | | Change-Id: I7a086308a95e7bd3063e4a9802e0d0cb93f9558c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Check for .tag file existence before reading itAlexandru Croitor2022-06-281-12/+16
| | | | | | | | | | | And also check for it in PROJECT_SOURCE_DIR rather than CMAKE_SOURCE_DIR, to ensure the repo .tag file is checked even when doing a top-level build. Change-Id: I63b0f5aae0b9111165fef9aeedd5e794db990da9 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 0b895aa93688926781e30fa5400832396e9c8bef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* clang wants C++ attributes before a func declaration nowadaysRobert Griebl2022-06-281-1/+1
| | | | | | | Change-Id: I7a537aa4b21e499ba7ca0a1d46314dce60266bfc Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 3da5d60c0e362504b18f9a567013504c9bdb1464) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-06-271-4/+4
| | | | | Change-Id: Idc2f7ca6499343d690f6a8fe73f5fc9e7af59ed0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-06-211-4/+4
| | | | | Change-Id: I0cefb2c9452f27e66ecbbf323efacec77ace2a52 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.3.2Jani Heikkinen2022-06-161-1/+1
| | | | | Change-Id: I0285b567f3ea6ecb9c2c4e7a67e99380d2c69017 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-06-161-4/+4
| | | | | Change-Id: Ib65bf09d5865051d33f2908d71ac56a4ee502e97 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make both supported Wayland text-input protocols available for clientsRobert Griebl2022-06-152-3/+13
| | | | | | | | | | | Qt's own protocol is the more stable option, and chosen automatically by QtVirtualKeyboard if it is made available by the compositor. Change-Id: Ic8c65e81acd2e461bf078bec26794019e0aa855c Task-number: QTBUG-103580 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 96e6f35fdb07795d59523bd8f91a2f3d7de21009) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix accidental double-click detection in autotestRobert Griebl2022-06-101-0/+2
| | | | | | | | Change-Id: I1e490d84774d07dfca4d2f5a8296d841fb499365 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 810cf1fc7dcb5ca0b6d3bdcc364ce9e3f212f806) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Deal with OpenSSL3's changed defaults when parsing PKCS12 certificatesRobert Griebl2022-06-077-12/+63
| | | | | | | | | | | | | | | | OpenSSL3 doesn't like old certificates, but macOS doesn't like the new ones. For the cross-platform signature auto test, we need to enable handling of legacy certificates in OpenSSL3. Also fixed the process to regenerate the test signatures (for when macOS' SecurityFramework may catch up in the future) Change-Id: Ie95ebb0878e4c6c4b96ef45263575bc2135197d0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 68170feaeefef6aa9764205bbcb10249b6a4a5c1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-05-311-4/+4
| | | | | Change-Id: I36b744641e1bc72fa15f85c5792264c85da2669f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use real file names when creating the wrappersRobert Griebl2022-05-301-4/+4
| | | | | | | | | | | We can't rely on the targets being set-up the way we expect them, especially when cross-compiling against a tools-only host build. Change-Id: I6f33be8697be9c0fa3734cc64ec171149623b026 Fixes: QTBUG-101508 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 481846d7d81056c331f244a28c5eaf9a05e0ff89) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-05-271-4/+4
| | | | | Change-Id: I2d9a815640a3d5752d9445dfe4200a2b375d884c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-05-201-4/+4
| | | | | Change-Id: I9d233ca620b75081f4b245c35b330a49eca1eef2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-05-121-4/+4
| | | | | Change-Id: Ibfa16ef8cdcacc7c8788fb8cc9326502e0380a33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-05-101-4/+4
| | | | | Change-Id: I4db2f6d3c8987c9e151099c992f512554ef00bda Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-04-271-4/+4
| | | | | Change-Id: I0cea9c52996f6c30cfdcdb7fcf7e839202b201af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix the X11::Xi dependency not being found when building standaloneRobert Griebl2022-04-271-1/+3
| | | | | | | Change-Id: I4ab2c3a646d03040e5eaf8d5035ee61154de75e2 Fixes: QTBUG-100853 Pick-to: 6.2 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Fix the QML tst_installer to run on WindowsRobert Griebl2022-04-274-15/+34
| | | | | | | Change-Id: Ic6a24d2d849a3d00e4e44f83ef6410bab4aca7c2 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 5184cb19845e1b5bc25665e49e423f0dd8a25a5c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't rely on the system environment to be UTF-8 when building packagesRobert Griebl2022-04-271-18/+4
| | | | | | | | | Instead, set a well-known UTF-8 locale ourselves. Change-Id: I67e4eaa9dbadf690924b091f93cf1d61425ea451 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 5f053ea7f609a269457ff1cd75aeb924a8a0d60f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use AM_TIMEOUT_FACTOR on coin to stabilize tests on the CIRobert Griebl2022-04-271-0/+3
| | | | | | | | | (this was missing the 6.3 Pick-to tag) Change-Id: Ic91c96b670fb0de07873b3f422580978093d0196 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit e332553fd2998b901a38e93c139b81beed5d61f5)
* macos: Fix the appman-qmltestrunnerDominik Holland2022-04-263-7/+10
| | | | | | | | | | | | | | | | | We cannot rely on the QTestRootObject::instance() method as this function is inlined by the compiler and because of that doesn't provide the same instance as used in QML. Instead we use the new singletonInstance() method to retrieve the instance from the QQmlEngine. This also enables the qml tests on macos again. Fixes: QTBUG-102736 Change-Id: Ia73bb9ce54236a30683c1fa9f5fd51a1e456aad4 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit a58939de5c5a917efef77365e04a14669404de06) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-04-201-4/+4
| | | | | Change-Id: Ie1f0532f79360107d255d291a53e3322c6c37fe0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-04-191-4/+4
| | | | | Change-Id: I399d4c005ab7a9f3eb56af89cd532320f76d36b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-04-181-4/+4
| | | | | Change-Id: I978d852f7057ee83853a916ae49c2935f802bb0b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-04-081-4/+4
| | | | | Change-Id: I1d3dd86546de168f8a19259b1081c349599e350e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-04-061-4/+4
| | | | | Change-Id: I4ceeb4db42f847d9a8481298ee19ba076a808823 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-04-011-4/+4
| | | | | Change-Id: I9ba1d657677d5a569e1bd26b564d78c696e41a01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-03-301-4/+4
| | | | | Change-Id: Id852b6f7e08bfc25ff09280254cbda5aff874e4f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status