summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Replace all #pragma once with old-style #ifdef include guardsRobert Griebl2024-03-05138-138/+552
| | | | | | | | Change-Id: I1805fbccf4d9398fddfe8f4ab977236afc49ca45 Fixes: QTBUG-122951 Pick-to: 6.7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Avoid promoting WrapLibYaml to global in configure.cmakeAlexey Edelev2024-02-291-0/+3
| | | | | | Pick-to: 6.6 6.7 Change-Id: Ib359259a675689efa82ef42728f3ea7f25c9cc51 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* CMake: Change the cwd to the location of the system-ui-wrapper scriptDominik Holland2024-02-281-0/+2
| | | | | | | | | This makes sure the script works correctly wherever it is called from. Change-Id: Ic19ca09890f0ee82a2fa5e3dca81403f2b849eae Fixes: QTBUG-117010 Pick-to: 6.7 6.6 6.5 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* coverage: make sure lcov version 2 is availableRobert Griebl2024-02-281-0/+1
| | | | | | Change-Id: I0864195736780d0bd91966b366a635235b83b12f Pick-to: 6.7 6.6 6.5 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* tests: shorten the qml testrunner tag to make reports more readableRobert Griebl2024-02-281-1/+1
| | | | | | Change-Id: Ib5a4592b586a94be6f58848c51fc76b7163cdfc3 Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* doc: document that Window.parent is not supported on AMWs yetRobert Griebl2024-02-281-0/+2
| | | | | | Change-Id: I7daa6bd08dcc9b03ac37f2a1c8fd34cdf4e4163b Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* tests: stabilize flaky tests and add context on failuresRobert Griebl2024-02-283-14/+16
| | | | | | Change-Id: I2de8d216e875af83cb8a14b3ddcefdd787615634 Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* coin: Improve the code coverage setupDominik Holland2024-02-282-3/+17
| | | | | | | | | | * Set AM_TIMEOUT_FACTOR * Retry tests up to 3 times if they fail * Create a zip of the coverage-report folder * Exclude some more files Change-Id: I23d2e67bf4e7c192ce024e4c6602d531823d9ed4 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Update dependencies on 'dev' in qt/qtapplicationmanagerQt Submodule Update Bot2024-02-271-6/+6
| | | | | Change-Id: I39e758cc44a525253895f301f7d67590407775e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix the two weirdly named auto testsRobert Griebl2024-02-2614-7/+7
| | | | | | | | | | | | | | applicationinstaller -> packagemanager The ApplicationInstaller singleton has been long replaced by PackageManager and that test had been adapted back then. qml/simple -> qml/applicationmanager This was always named incorrectly and is always a source of confusion. Change-Id: Iba25cd9b6b77344b2845a5c1c14cbac6ef489410 Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Cope with macOS decomposed file names in the PackageManager auto testRobert Griebl2024-02-262-0/+7
| | | | | Change-Id: I2da5b63c771e48c7b851a43f4acae7d14109537f Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* doc: all QStringLists are documented as list<string> for QML and YAMLRobert Griebl2024-02-264-21/+21
| | | | | | | | | | It doesn't make sense to use a different syntax for QML vs. YAML. Also fixed "categories" wrongly being documented as object. Change-Id: Iaa1ed6801908dd852ec1c5226605de67b0345ea8 Pick-to: 6.7 6.6 6.5 Fixes: QTBUG-122721 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Axivion: ignore everything we cannot controlRobert Griebl2024-02-261-6/+3
| | | | | Change-Id: I75e66db02712c5f666737c5fb25fa1c199c1b015 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* coin: Add special build instruction for a lcov code coverage buildRobert Griebl2024-02-262-4/+62
| | | | | Change-Id: I1b80794524e1600a0be5b751b00e69d63407e46a Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Coverage: make it possible to use any Qt buildRobert Griebl2024-02-262-10/+17
| | | | | | | | | | | With these changes, a coverage build is possible: - against a Qt from the installer - against a non-prefixed developer build Qt - when using Coin's stand-alone tests setup Change-Id: I1d9958e2a8cfd1f241a5b6bf5d276751df7957b2 Pick-to: 6.7 6.6 6.5 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* auto-tests: fix the check for QT_FEATURE_am_installerRobert Griebl2024-02-262-0/+5
| | | | | | Change-Id: Ibd6b38b0feeb96402254cfaed576231b014db94c Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 0ea0aaad73d09c9aa65979f781b8a103a3e1f83b)
* Update dependencies on 'dev' in qt/qtapplicationmanagerQt Submodule Update Bot2024-02-251-6/+6
| | | | | Change-Id: I4fd199da26c4016310e5d2273ab2676e51afde01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tests: add a test for Architecture detectionRobert Griebl2024-02-2212-46/+134
| | | | | | | | | | | | | | The test binaries are compressed because you cannot make them as small as possible. Especially macOS enforces the minimum size to be the page size (16KB). The README.md has all the details on how to generate and compress test binaries. Change-Id: I8636772f2f94ac35e8d4fa51b6b76b0c84ad3d7b Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* tests: add a test for ApplicationInterface propertiesRobert Griebl2024-02-213-6/+57
| | | | | | Change-Id: I80a20c62e58dcfabe45054cfc322e1d03dc683ac Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Coverage: adapt to modern lcov/gcov command line optionsRobert Griebl2024-02-211-11/+13
| | | | | | Change-Id: Ib525623d20ca58c74c89aa2ab6a569e1a6a7de5a Pick-to: 6.7 6.6 6.5 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Axivion: fix or document most of the reported issuesRobert Griebl2024-02-2139-102/+183
| | | | | | | Change-Id: I5723096b8db71c216b33e189a2469b3130c19504 Pick-to: 6.7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Update dependencies on 'dev' in qt/qtapplicationmanagerQt Submodule Update Bot2024-02-191-6/+6
| | | | | Change-Id: Ie3ebd7ae3962d8339be8d228a9989fe4a02b99c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* doc: clarify what the am.qml* logging categories are meant forRobert Griebl2024-02-192-2/+6
| | | | | | | Change-Id: I9e54f687e2ae2f01f3cd9e0dc55eb33968710b64 Pick-to: 6.7 6.6 6.5 Fixes: QTBUG-122425 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Re-enable console/terminal output on WindowsRobert Griebl2024-02-194-1/+9
| | | | | | | | | | This was accidentally disabled due to a bug in the Qt6 porting tool, which didn't take the "config *= console" qmake setting into account. Change-Id: I2d255b03e0ac52255423fc612c5afc411d6d6a17 Pick-to: 6.7 6.6 6.5 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* doc: fix file quoting in bwrap exampleRobert Griebl2024-02-181-3/+2
| | | | | | Change-Id: Iec21d4b347d7d5353206fda84737571510678640 Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* auto-tests: Fix controller testRobert Griebl2024-02-181-2/+2
| | | | | | | | | This (a) adapts to the latests instance-suffix changes and (b) tries to run an dev-build controller binary before using the installed one. Change-Id: Ib77708b948184c154519aa7c73df268b17a65c59 Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Update dependencies on 'dev' in qt/qtapplicationmanagerQt Submodule Update Bot2024-02-121-6/+6
| | | | | Change-Id: I72f2e426e4b1c5f9aa538cd74069a301d3a9db8e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* controller: ignore stdin/out/err redirections on WindowsRobert Griebl2024-02-071-1/+9
| | | | | | Change-Id: Ibcff0aea7adb62611461d26851ce88ef6bcbd5a0 Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Logging: add a D-Bus specific logging categoryRobert Griebl2024-02-074-8/+10
| | | | | | Change-Id: I591b838234c791d18f4a7d5bfd4fdd6998dd654d Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Examples: check if the server command is valid in package-installationRobert Griebl2024-02-071-3/+7
| | | | | | | | | This is only the case, if the example is started via the generated .bat/.sh wrapper. Change-Id: I9f9ea0c54547c5be2a37ad3683755399e053ea1f Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Examples: make the package-installation cope with external acknowledgeRobert Griebl2024-02-071-2/+16
| | | | | | | | | | In case of an installation via the Creator integration, installations get automatically acknowledged and we can close the acknowledge dialog in this situation. Change-Id: I6478fdb820a3d675862d971999d4840638f9d1b7 Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* cmake: fix quoting in qt6_am_add_systemui_wrapperRobert Griebl2024-02-072-8/+12
| | | | | | Change-Id: If8164dbb08bcc7cf7fe56d7e93dd37f32603a03a Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Use a P2P DBus on non-Linux platforms for the appman-controllerRobert Griebl2024-02-073-69/+177
| | | | | | | Change-Id: I331a4221ecd92fcf4af67e4fe20546b4abef22bf Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix package installations with absolute package paths on WindowsRobert Griebl2024-02-071-1/+6
| | | | | | Change-Id: I3b810dfa4ca73c2959f72786e597436409d5e29a Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Change object destruction order in launcher-qmlRobert Griebl2024-02-071-14/+16
| | | | | | | | | | Always delete the ApplicationMain object last, even when catching an exception. If something in ~QGuiApplication crashes the process, we wouldn't be able to see the original error message from the exception. Change-Id: Ibfc95b8a1ca1b73cfb4627cbb651cb380a66000c Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Update dependencies on 'dev' in qt/qtapplicationmanagerQt Submodule Update Bot2024-02-071-6/+6
| | | | | Change-Id: I781a21aec6455d9cbabf76c5582057e54d9d8d66 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* doc: add a bit more to the 6.7 whats new pageRobert Griebl2024-02-012-2/+9
| | | | | | Pick-to: 6.7 Change-Id: I369b8085ca724e5ab5cf41470ba0b9c7e755e6d8 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* doc: fix spellingRobert Griebl2024-02-012-6/+6
| | | | | | Change-Id: I253931e846b8fbdfbfa50284ffde88c5792b608a Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* doc: package-installation exampleRobert Griebl2024-02-014-4/+102
| | | | | | Change-Id: I0f80790ae654c35ec85f4bd0e62da06c17223298 Pick-to: 6.7 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* cmake: move the qt_am_create_package command from examples to main-libRobert Griebl2024-02-013-39/+143
| | | | | | | | | This will be in TP for 6.7 until we gain more experience with the new QtCreator integration. Change-Id: I9a9efac81a9f6d4994be6e47fee3090fe75d181a Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Only load container plugins which are actually usedDominik Holland2024-02-012-2/+11
| | | | | | | | | Only load the container plugin if there is a configuration for it as well. Pick-to: 6.7 Change-Id: I082cf9bf9d78779ca9a2f3e30be9bfa8a76bd0a4 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* doc: more ApplicationManagerWindow documentationRobert Griebl2024-01-302-46/+29
| | | | | | Change-Id: I6751f45711d71681e9dff57f51b26ff5f97e8ad4 Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Fix AMW.color difference between single and multi-process modeRobert Griebl2024-01-303-3/+12
| | | | | | Change-Id: I75242f768d5766d489ce11c1f0477dc095c51fe8 Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* doc: ApplicationManagerWindow properties and signalsRobert Griebl2024-01-308-11/+269
| | | | | | | | | | | | | | The class documentation still needs a rewrite. Also in this patch: the inProcess property was renamed to singleProcess to match the existing property in ApplicationManager. Besides, this should be a lot clearer to the user, as the documentation only ever talks about single- vs. multi-process, but never mentions the term "in-process". Change-Id: I3baa4e000c8acdb662f2ed472387cdf7e8741048 Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* doc: update What's New for for 6.7Robert Griebl2024-01-302-1/+52
| | | | | | Change-Id: I0b44a0ff6c4b21a96cc89356419195624d6e78ee Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Update dependencies on 'dev' in qt/qtapplicationmanagerQt Submodule Update Bot2024-01-291-4/+4
| | | | | Change-Id: I75749a623b8e42ad32bfc9b0c28a6cb49589cfb8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix smaps parser not working on ARM64Robert Griebl2024-01-251-1/+1
| | | | | | Change-Id: Icf528d14bf097613f36c98aaa82805bd6f743866 Pick-to: 6.7 6.5 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Fix QML debugger freeze on exitRobert Griebl2024-01-251-2/+4
| | | | | | | | | | We need to make sure that the QML engine dies before the qApp instance, because otherwise the QML debugger thread's event loop is quit from too early. Change-Id: I57df9011dd4a1347289f9e17876c9b86217ba024 Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Fix crash on Qt.quit in applicationsRobert Griebl2024-01-252-39/+65
| | | | | | | | | | | The backing QQuickWindow might die earlier than our ApplicationManagerWindow, so we need to be prepared for that. This only ever crashed in the destructor, but this patch adds checks to every m_qwindow access: better be safe than sorry. Change-Id: I764a796ff8c5c09fb21175d8add51933ffe82ded Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Revamp the instance-id and the dbus anchors for the controllerRobert Griebl2024-01-255-74/+200
| | | | | | | | | | | | | | | | | | | | This is necessary for a nicer QtCreator integration, plus it fixes two bugs: 1) the DBus data was overwritten by an instance with the same id. 2) the controller could not address 2 instances with the same id individually Instead of 3 separate, unprotected files (one for each DBus interface) in /tmp, we are now creating 2 files in $XDG_RUNTIME_DIR /qtapplicationmanager (or the temp dir on non-Linux platforms) - a .lock file (via QLockFile), which let's us track an instance's lifetime - a .json file which currently contains the DBus addresses for the singleton interfaces Pick-to: 6.7 Change-Id: Idd4fff96897ec9bb609cbf5521317b74df6d0fd4 Reviewed-by: Dominik Holland <dominik.holland@qt.io>