summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qtactiveqtv6.2.8-lts-lgpl6.2Qt Submodule Update Bot2024-03-261-1/+1
| | | | | Change-Id: I5307b292146a310ae09cdecad3eb1ee1c3da48b9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into ↵Tarja Sundqvist2024-02-207-23/+58
|\ | | | | | | | | | | | | | | | | tqtc/lts-6.2-opensource Conflicts solved in a file: dependencies.yaml Change-Id: I2536b35d41b1549013c039d82b074bc41905e8b2
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-03-291-1/+1
| | | | | | | | | | Change-Id: I0b0ba37a13d842f625b742b4880278a09c5660ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-03-271-1/+1
| | | | | | | | | | Change-Id: Ic9dc094acc3d7a0d7dff0d7be4fd1539c3fa3c18 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-03-221-1/+1
| | | | | | | | | | Change-Id: I581ac57df93285d232d70c51a3c426c86a71bd19 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-03-161-1/+1
| | | | | | | | | | Change-Id: I1bf2110a13a797daa43a21b7a45fe175bd6ed959 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-03-131-1/+1
| | | | | | | | | | Change-Id: I640e9e87766d97927e32a0f22011243b55b90a55 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-03-101-1/+1
| | | | | | | | | | Change-Id: Ie12beb7c419f2bd4c5c3882b2f5159b48eefa2a2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-02-271-1/+1
| | | | | | | | | | Change-Id: Ic92aee94654a2f7926eb87e251edabe380ba69c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-02-211-1/+1
| | | | | | | | | | Change-Id: Ia37b3cc7e722e17e11ef2b79086b673168a9f827 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-02-161-1/+1
| | | | | | | | | | Change-Id: I8a2fd156796bc6330467ac2a632425f14710cc5f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-02-101-1/+1
| | | | | | | | | | Change-Id: I89814c170079a222865dff57f8fc7dcaa19b02aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-02-071-1/+1
| | | | | | | | | | Change-Id: Iaad2f58e74aa7dec20df5f0519a8e824eacb5ce6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * CMake: Fix "no rc file" case when running idcAlexandru Croitor2023-02-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case if no rc file is present in the sources of a target that has qt6_add_axserver_library called on it, the build would fail with unknown command when trying to run the "echo" part of the command. This happens because cmd.exe interprets the echo and its argument as a single argument, despite the space between then. Use $<SEMICOLON> in conjunction with COMMAND_EXPAND_LISTS to ensure the echo and the argument that follows it are split. Also remove the extra quotes which are not needed. Tested to work with powershell and cmd.exe with CMake 3.16.9, 3.17.4, 3.18.4, 3.21.2, 3.24.2. Amends 2b8681267a1f79734b379b7d7776c520de7be5b5 Change-Id: If81f7f6947e35709ce4cf1a0333247fb238cf73a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 1908117dbbb1e51fe74baac0c0a0d3423bc41152)
| * CMake: Fix idc in-tree example build when using CMake 3.24Alexandru Croitor2023-02-061-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using CMake 3.24 to build qtactiveqt with in-tree examples, the build would fail with 'C:/Users/qt/work/qt/qtactiveqt_build/bin/Debug/idc.exe' is not recognized as an internal or external command, This seems to happen due to a combination of things: - using CMake 3.22+ - Windows -debug-and-release (Ninja Multi-Config) - excluding the idc tool debug variant from being built with EXCLUDE_FROM_ALL as part of a regular qt_internal_add_tool call - using add_custom_command(POST_BUILD) instead of (OUTPUT) - using $<TARGET_FILE> generator expression in the command instead of just the target name (due to having to prepend an environment setting shell script) Fix this by wrapping the relevant $<TARGET_FILE> arguments in a $<COMMAND_CONFIG> generator expression, similar how it was done in 97b1062674283afb0131e73d8319c95aa7087a8b for qtdeclarative. Note that in one case, we split the $<IF> expression into sub-expressions, and wrap $<TARGET_FILE> in $<COMMAND_CONFIG> only for the tool path, because $<COMMAND_CONFIG> can only wrap the outer-most generator expression in an argument, according to the docs, and we don't want to apply it to the target and output tlb file. Task-number: QTQAINFRA-5044 Change-Id: Ib5daa3b7c7d40761a42e5772add69c700752a6e6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit fe41d5656f9c9494499061ccc0eb8d076de0e1f2)
| * CMake: Use new _qt_internal_get_tool_wrapper_script_pathAlexandru Croitor2023-02-061-10/+18
| | | | | | | | | | | | | | | | Change-Id: Ic62239033a5a291b7b33b2add460089e4302b8f2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit a617b92d60c073a2d5ac89da73f73b9a0a309154) Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-02-031-1/+1
| | | | | | | | | | Change-Id: I4c6c1d35c044d4cfb3b49322a11d05b54970cbb5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-01-311-1/+1
| | | | | | | | | | Change-Id: I8c159ec6581514e75c4780220458d61de8d5410d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-01-171-1/+1
| | | | | | | | | | Change-Id: I0812a9d9ef773b15b1660dbeec8082f01eb6027b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-01-091-1/+1
| | | | | | | | | | Change-Id: I4d2fdfceb062dc84fd41ab127be52c0dc54fa65f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-01-031-1/+1
| | | | | | | | | | Change-Id: Ie60abcc2db2ad38fd0d9c89c94cb254383b20bca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-12-281-1/+1
| | | | | | | | | | Change-Id: I3dbc9db2b21410b8a8baa4935dfb035bab4bf431 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Port from <cctype> toupper() to QtMiscUtils::toAsciiUpper()Marc Mutz2022-12-233-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C toupper function is locale-dependent. Given the right locale (Türkiye, e.g.), toupper(i) is either - İ (LATIN CAPITAL LETTER I WITH DOT ABOVE; if representable) or - i (unchanged; if it isn't) Both results are wrong for the use-cases at hand. Task-number: QTBUG-109235 Change-Id: Ia9726f0079c5f2625d97a341836b3d4505db6be1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> (cherry picked from commit 09b4615abcdbef7087bb9862a3e73f3bb7930768) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-12-231-1/+1
| | | | | | | | | | Change-Id: I3834406b1d59cb0075031cc6f9c04d84b503b3e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-12-201-1/+1
| | | | | | | | | | Change-Id: I93144a1aa3ffc3b5778e9ed911ef532a57fa66f6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-12-151-1/+1
| | | | | | | | | | Change-Id: I05a12a8153c4c0498c14d8fef6f22eb6ae3016c0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Bump version to 6.2.8Tarja Sundqvist2022-12-112-2/+2
| | | | | | | | | | Change-Id: Ia41d64271fc0478ab2eae0483af45dda7d523c0d Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-12-111-1/+1
| | | | | | | | | | Change-Id: I6752407c01cbf84048173399c2b9a1b56013de86 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-12-051-1/+1
| | | | | | | | | | Change-Id: I4ad3ae9b640cb47eafe1f8a660129830e7a9a1a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-11-291-1/+1
| | | | | | | | | | Change-Id: I9b2a3d67c3af85bcb20880eecaa831703796d5cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qtactiveqtv6.2.7-lts-lgplQt Submodule Update Bot2023-10-311-1/+1
| | | | | | | | | | Change-Id: I93fad75e22b1a0ebfed82c3769215832f3b277f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qtactiveqtQt Submodule Update Bot2023-10-111-1/+1
| | | | | | | | | | Change-Id: Iacb487a01468c3615d73cc9419080d10cb6f8bd0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-6.2.7' into ↵Tarja Sundqvist2023-10-033-2/+3
|\ \ | | | | | | | | | | | | | | | tqtc/lts-6.2-opensource Change-Id: I15a8ee22a8919df68b1bfc1d0cb4d01bf38ff0e9
| * | Update dependencies on 'tqtc/lts-6.2.7' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-11-281-1/+1
| |/ | | | | | | | | Change-Id: I14e0ec5ca5103a226847cd5f3d1c28768da30ff7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Coin: Add alias to non tqtc moduleToni Saario2022-11-221-0/+1
| | | | | | | | | | | | | | | | This changes the module name in Coin to match what is run in qt5 integration and allows reuse of artifacts. Change-Id: I71a66b5574ab760eec4dae865d00d92ab269e2e3 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-11-221-1/+1
| | | | | | | | | | Change-Id: I73210411c520d5336f006520f8b53fb1a970278f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-11-181-1/+1
| | | | | | | | | | Change-Id: I92ee8a4d04141fcf36f049cc63bdac419d7b2bd5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-11-141-1/+1
| | | | | | | | | | Change-Id: I4f45cbbc0d26927c376862481e765d73dc52688c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-11-111-1/+1
| | | | | | | | | | Change-Id: I8da8f7a2d45136aa5c4a8b1a4bb8ee5382d69559 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-11-081-1/+1
| | | | | | | | | | Change-Id: I9fcee4a4facda0b56064c3887ed7845fc0c84a45 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-11-031-1/+1
| | | | | | | | | | Change-Id: I419dcd7b7f18eeff254064dd751e0ff7fec0c931 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-11-011-1/+1
| | | | | | | | | | Change-Id: I05566fe1e2f45498f669be18486a74bf1e641f41 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-10-261-1/+1
| | | | | | | | | | Change-Id: If588cc993de55e11ee8b01864b53899582cf337b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-10-201-1/+1
| | | | | | | | | | Change-Id: I43a756af7dc4dceeac3dafd2842ffdbca5db740e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-10-121-1/+1
| | | | | | | | | | Change-Id: Ib7939a068b86f8bd7015b574e67f95983463868f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-10-071-1/+1
| | | | | | | | | | Change-Id: Iec9474c098a606aa9fdafe5d83649079f0ffcb96 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-09-291-1/+1
| | | | | | | | | | Change-Id: Ia9e3871e80b4fb1ce8a347b7c71fe588ab2748a0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Bump version to 6.2.7Tarja Sundqvist2022-09-242-2/+2
| | | | | | | | | | Change-Id: I03edfe42e7254e25b470ee2d890758e144357a6d Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-09-241-1/+1
| | | | | | | | | | Change-Id: I7a515a775476071d6a81d654c32cb50e6eebb019 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtactiveqtQt Submodule Update Bot2022-09-141-1/+1
| | | | | | | | | | Change-Id: Iaa83f8d6d7cc316a5165282b951ac6667c2412b4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 08:30:06 +0000