summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Bump version to 6.3.1Jani Heikkinen2022-03-301-1/+1
| | | | | | Change-Id: I8e9ee4b970e8d8cb8b3ebeba9bc3ebff9b4ab823 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Disable QNX targetsToni Saario2022-03-291-0/+3
| | | | | | | | | Application manager cannot be built on QNX. Change-Id: Idcda9121df9cbbc6a483f7b237ca8a290443f952 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit ed06e6f753785e6023dfbaf0b18be78996ac2c0f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Really fix package removal if documentDir is not setRobert Griebl2022-03-251-1/+1
| | | | | | | | | | The fix in bc06a04dd845d039ba802f94b5eae57519ec63a8 was not correct in the package removal case. Change-Id: I65645a1895b6e5cba6dfa6bd61be1b1a638fe67a Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 074d1a70d273b72a369009a6105a7dcad2efc48b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QScopedPointer::take deprecation warningMårten Nordheim2022-03-2515-53/+79
| | | | | | | | | | By switching to unique_ptr. Fixes: QTBUG-101999 Change-Id: I39959da8561991b1657d1210692afff0c25e36a1 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 485b2467323c5f41994b96ae758354d018c3a077) Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Fix QCryptographicHash::addData deprecation warningsMårten Nordheim2022-03-242-2/+2
| | | | | | | | | By using QByteArrayView Change-Id: Ia4dd59c374aeb8a1b7d37a0117bd1a78f6bdf0be Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit f383bb3c9adb20a3bd5f768d064c98cb7f2d9691) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update uses of QCryptographicHash::addData to use qsizetypeMårten Nordheim2022-03-242-2/+2
| | | | | | | Change-Id: Ic1ec93c1864ab88b24014f573bca5f7aa68284b4 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 5b6bfaf371dc1f53750453904039db91aeca8d09) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Always install the qmltypes, even for cross buildsRobert Griebl2022-03-231-11/+11
| | | | | | | | | | Only the regeneration cannot be run in the cross build case. Change-Id: I08d5faafbac6d7cd2b1ddbcf233c8f9a4dbbfd03 Fixes: QTBUG-99781 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 3530d81e0b76d674e0e23890b787542bbbf73232) Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Fix the qmltypes generation regressionRobert Griebl2022-03-233-5/+15
| | | | | | | | | | | | Without generating them in the source directory, we have a hard time detecting changes, so that we can then commit those. This is how 5.15 used to work, but this got broken when the whole mechanism was reimplemented in cmake. Change-Id: I5c39cdeead655fdd324b07d66223100b4d372479 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 21a708ecffd5b34eb942959323cec8e0e45d813b) Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
* Migrate examples from 6.2 to 6.3Bernd Weimer2022-03-225-6/+7
| | | | | | | Change-Id: I82424fe66172851f3652ca6acbb4f4d6694a71c2 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit c6448d7661eb165fa9284d67161faf4918f7bc60) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix minor issuesBernd Weimer2022-03-223-2/+3
| | | | | | | | | | | Whether a JS array contains a value is checked with the includes() method. Aligned default window color in single- and multi-process mode (white). Change-Id: Ie315faafceaf91224b6669de0cff40e890cf5b33 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit f9516a90fc8f5a4492b53f9e55fd8d29969d3ee4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Detect and prevent installing the same package multiple times in parallelRobert Griebl2022-03-224-0/+41
| | | | | | | Change-Id: I8aa7e1f520346b6c946b0e1e122808d638ccb52c Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 7309841d99e76577758adb11c5b905004555b338) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Handle an empty or invalid documentDir correctlyRobert Griebl2022-03-225-4/+17
| | | | | | | | | | | | | | | | | Not specifying the documentDir, but enabling the installer would - unexpectedly - use $PWD as documentDir. The code does now follow the documentation: if not set, no document directories will be created on package installation. Also, we now fail early if the documentDir and installationDir are sub-directories of each other, as that would lead to mayhem on PackageManager::cleanupBrokenInstallations(). Change-Id: Id8d89f82bf0d63c771f3d86a963c66681f43f195 Fixes: QTBUG-101881 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit bc06a04dd845d039ba802f94b5eae57519ec63a8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix documentation errorsRobert Griebl2022-03-212-8/+1
| | | | | | | Change-Id: Ibbaa598ce78b6d3e9c0bae9860737355afd82111 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 8f0a7fc2429b01f4196e615e1dff2be13f26306d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Document the ASAN/LSAN options for leak checkingRobert Griebl2022-03-212-0/+13
| | | | | | | Change-Id: Ied2ace0e9fbbe0ccf850861d6e75a69bc59d627f Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit ddb643bf859e29fd825ad8166c49b66a69ba7e39) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix memory leaks in the auto testsRobert Griebl2022-03-212-4/+13
| | | | | | | | | Found by using the Linux/gcc/ASAN leak checker. Change-Id: Id9e2aae8c79b0d1ae71f90e7fbbb876ff9076def Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 4178fd06ebf3af17019b29d7010a2b81571bec91) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix memory leaks introduced by adding the PackageInfo mechanismRobert Griebl2022-03-2111-6/+40
| | | | | | | | | Found by the Linux/gcc/ASAN leak checker. Change-Id: I3c85515b994ad21b8718349baa81f9fc52a20615 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 969864e00491d262cdaf167a8d72ea5b0538bc7d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make the main auto test more maintainableRobert Griebl2022-03-211-46/+62
| | | | | | | | | Also added a test for the StartupTimer while at it. Change-Id: I96d522bb5744b5254c9e6d16a956237606693b4a Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 9e6df5575b993c50ab99bada2885f6af5c5884ff) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Re-enable running autotests on macOSRobert Griebl2022-03-215-15/+26
| | | | | | | | | | | We could theoretically also run them on Windows now, but the tst_main test non-deterministically freezes regardless of compiler (MSVC or MingW) and OS (Win 10 or Win 11). Change-Id: Ic55063e277ab28ec087cf644e5007744f9f2303a Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 5a3290462d617c63660ddebc94cf122cb1dc6eed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Untangle the icon/name/description/categories messRobert Griebl2022-03-2131-298/+923
| | | | | | | | | | | | | | | | | | | | | | | | | The documentation and the implementation disagreed quite heavily in regards to the icon, name, description and categories fields in the manifest for the package, each application and each intent. The implementation now follows the existing documentation, but also relaxing the requirements of icon and name being required for packages. Also, it was confusing that applications could not override these properties from the package like intents can do, so they also got these properties. Finally, everything is now correctly exposed to QML, with legacy wrappers in place to not break old code. In addition, the completely outdated applicationinfo unit-test was rewritten to test all the current field combinations. Change-Id: Ie5ad84bc6b771d6702b1994d1c8ae9f0204643b9 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 3af34ee549f6514a3396b196edc6b8415c8db3af) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the userIdSeparation check on startupRobert Griebl2022-03-211-1/+1
| | | | | | | Change-Id: I7c109d378fd06bd9d3efdf8d495e2e4407ea1dd1 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 744ecc7fe73819a685531ed64e3af62f1816fc53) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Allocate the signal stack using an anon mappingRobert Griebl2022-03-211-10/+13
| | | | | | | Change-Id: I970316adf175b2b09c6c82dfcf9b1d47c70d7e6a Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 0b30b32a6cd4550173c4139a0fdd74a94a8d41a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Work around unused result issue in gccBernd Weimer2022-03-212-4/+7
| | | | | | | | | This fixes compilation errors even for older versions of glibc. Change-Id: I1ee1be6ad311a0ba47d8e83083bf9ad7bb43f4bf Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit f64114ea2c2c1bce04271ddc16bf331f3d3d79b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Adjust title of Hello Word exampleTopi Reinio2022-03-216-9/+9
| | | | | | | | | | | | An example title starting with punctuation makes the example appear as the first one in Qt Creator's Welcome mode; this is not desired for this example, so rename its title. Task-number: QTBUG-100139 Change-Id: Iff725a90e0f5c411c1d87d19c34453b69e78bb9c Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit a19a7db2326b02df3831b40406ec00d0e33f00d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-03-211-4/+4
| | | | | Change-Id: I42caf18748928f94ea032fc22e319b899fdda13a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* UrlHandlers have to be properly unregistered nowadaysRobert Griebl2022-03-181-0/+2
| | | | | | | Change-Id: I60637b5c782cdb38669d751991a8e1e879754906 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 18d10c730e27560eb691c2a0bae605dc4d3d226a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Additional debug output to help with trouble shootingRobert Griebl2022-03-181-1/+4
| | | | | | | | Change-Id: I14168cdf2674affc5faaf5840485bc07aa824b12 Reviewed-by: Dominik Holland <dominik.holland@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 26cc058cd2b268e21c0b9becf10a502afb8b93e3) Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-03-161-4/+4
| | | | | Change-Id: Ie9a77096fc5468bc1e1f9d447b3cb23f1d81aced 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-141-4/+4
| | | | | Change-Id: Ibf1a320eec42b01f48f879f4ce6fe78181216f3e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerv6.3.0-beta3Qt Submodule Update Bot2022-03-111-4/+4
| | | | | Change-Id: Ie35ee0d6c6e8da43b47e6462cb04d544370699db 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-081-4/+4
| | | | | Change-Id: Iefe5498f601f8e8ef8717482f2489fbbbc84975b 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-041-4/+4
| | | | | Change-Id: I614b4342ee533379f7915a9727c2adfc94bdbbf7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-02-231-4/+4
| | | | | Change-Id: I20999dbcdc1c5e4570449dec37d3cdff72a1fedb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-02-211-4/+4
| | | | | Change-Id: I903321079b6cc6307db7b3f9510fbf6718599fa1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-02-171-4/+4
| | | | | Change-Id: I4758a8406f4dc2529ba3c0081dbdbcb42f92fbec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix Signature creation on macOS 12Robert Griebl2022-02-153-7/+9
| | | | | | | | | | | | macOS did not support signatures on empty hashes, but macOS 12 now does. In order to be cross platform compatible, we already prevented signing those hashes in the OpenSSL backend in the past. This patch now checks for empty hashes regardless of the backend. Change-Id: I5c100073cdf9b5329edac495708f4e0288cd952f Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit b0c82c2c26d7cbd810ae04899383990aa18052ef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerv6.3.0-beta2Qt Submodule Update Bot2022-02-121-4/+4
| | | | | Change-Id: I42c36850ef956243e827ca2510f579952ec162d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix broken plugins.qmltypesRobert Griebl2022-02-111-1/+1
| | | | | | | | | | The AM was registering "Window" instead of "WindowObject", essentially overwriting the registration for the "Window" in QtDeclarative. Change-Id: Ie0bb04735cb56ad0aaa200793f1cac289ad607e1 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 783ea24f6cdb6c714fafde97aa1abf400578d3ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing property documentationRobert Griebl2022-02-111-0/+6
| | | | | | | Change-Id: Ib4d8ead046f21b3b06fc555195ae58785cca092c Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 8c816afd143edeac4feeec6ed6b17cb1e1859ef3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make sure to mark external dependencies as such via PUBLIC_LIBRARIESRobert Griebl2022-02-102-2/+5
| | | | | | | | Change-Id: Ibfeb775624650e4bfca3233bcd362789fefd2593 Fixes: QTBUG-100701 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 5e50996b9dd599625032a4b31da17cfbefc436b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Prefer STL style iterators over the Java varietyRobert Griebl2022-02-103-11/+7
| | | | | | | | | Change-Id: Ia633cdaa9ac870f538dd4bcec230e76ca57fb170 Fixes: QTBUG-100510 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 30482d24678748e457bec0f466eab649933e1dde) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-02-101-4/+4
| | | | | Change-Id: Ied21394d3d7eeb1f5d9f12de39c06d456bac6c16 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerv6.3.0-beta1Qt Submodule Update Bot2022-01-311-4/+4
| | | | | Change-Id: I728f2624dd8271c389c4b753687c8e7b3373ef54 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-01-261-4/+4
| | | | | Change-Id: I284a68ae04e382242f4301a1ce0b9be634418b83 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-01-251-4/+4
| | | | | Change-Id: Iaeb39dc12ce377041b54cab48a87f2986f11e772 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use another way to not compile qdbusxml2cpp generated cpp filesRobert Griebl2022-01-201-2/+16
| | | | | | | | Change-Id: I8122e8a58585d6c25b9a8e6d7006a450e4278abf Fixes: QTBUG-100088 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 17471110a10ac68d56e05df6dce318101ea00630) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix generation of third-party license codeKai Köhne2022-01-191-1/+1
| | | | | | | | | | The qdoc project is called qtapplicationmanager. Fixes: QTBUG-100043 Change-Id: I9ef44fed6dd534976984667778c6cd416c308101 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 7a38c13fc6038391089f0a2a3d474defbe1046bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve examplesBernd Weimer2022-01-1913-21/+24
| | | | | | | | | Fixed build issues, avoided warnings and improved output. Change-Id: I07f2e950399fb7b5a934686e5efe48cfaf7135e4 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 98e900a40c9bb237b0c0ff5e50cc06f45923b42a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix deferred logging crashBernd Weimer2022-01-192-2/+9
| | | | | | | | | | | | | | If more than one configuration file is used, parsing is done concurrently and hence debug output might be generated in parallel. Appending output to the deferred messages vector was however not thread safe. A mutex has been added to remedy this. Cherry-picked from 5.15: d45eef3 Change-Id: If55bf0d8d1618e943f0543dafaed0f4f08c94242 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit e7aae3561f7b8c060dff2027a1a049e86ae78ad2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerQt Submodule Update Bot2022-01-131-4/+4
| | | | | Change-Id: I4827d26e098958f779d2ce9db47b9f7a9d3189ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtapplicationmanagerv6.3.0-alpha1Qt Submodule Update Bot2022-01-081-4/+4
| | | | | Change-Id: I31b0fbfe48b9b63fd8325a91de82c897e70564ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>