summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.0' in qt/qtscxml6.2.0Qt Submodule Update Bot2021-10-041-2/+2
| | | | | Change-Id: I87ee4a74f45a1875239ab234a9c58cef6d296d94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtscxmlQt Submodule Update Bot2021-10-041-1/+1
| | | | | Change-Id: I8d55d863b8388e73300236626b21dc9b7dcb7812 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENTIikka Eklund2021-10-031-1/+1
| | | | | | | | Current value should be empty to reflect the branch status. Pick-to: 6.2 Change-Id: I68c1f717b0244c1e0f381588ca1229309cf071fe Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.2.0' in qt/qtscxmlv6.2.0Qt Submodule Update Bot2021-09-251-2/+2
| | | | | Change-Id: If4590c606b2e05b62b5157b2c229f88cd7525645 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtscxmlQt Submodule Update Bot2021-09-221-2/+2
| | | | | Change-Id: Id0ce93e25e4b21c68fe43dbcaf5e58288efda59b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtscxmlv6.2.0-rc2Qt Submodule Update Bot2021-09-211-2/+2
| | | | | Change-Id: I8d897a8b5080568bf03e26228c738e6b04b1437d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtscxmlQt Submodule Update Bot2021-09-191-2/+2
| | | | | Change-Id: I6a9a999ee8019deb8020524546675b3a57e6fedd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtscxmlv6.2.0-rc1Qt Submodule Update Bot2021-09-141-2/+2
| | | | | Change-Id: Ib0de7b7da2389a3e6bc2248295557faebbdb36be Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtscxmlQt Submodule Update Bot2021-09-111-2/+2
| | | | | Change-Id: If9ca83714b3027965e92b551303ee66579698b7f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtscxmlQt Submodule Update Bot2021-09-111-2/+2
| | | | | Change-Id: Iaf6a65266460221bda09180143791fdb2611e79f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtscxmlQt Submodule Update Bot2021-09-101-2/+2
| | | | | Change-Id: Id33a16b4640002e339d3d76fa54a08828f9d3b7d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtscxmlQt Submodule Update Bot2021-09-101-2/+2
| | | | | Change-Id: Ia7960c1b0c241b85e5dae2fe3d612079dce289d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-081-2/+2
| | | | | Change-Id: I563b0dd2fd289553459f7adedf581224f243e950 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-071-1/+1
| | | | | Change-Id: I0cc7a0724a8c535a4a57fbc10cbd7144cb035a60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-071-2/+2
| | | | | Change-Id: I09dba98b7ca70675830ec3bee14ab75efa7cfe0b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-061-2/+2
| | | | | Change-Id: I101f2f88c94fc7d06cba5d80c7e7966af057f5d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Ensure versionless wrappers do not introduce a new variable scope"Craig Scott2021-09-061-4/+5
| | | | | | | | | | | | | | This reverts commit 0d995353419ec4908a322ebae7b5797b8c758688. Macros add another level of escaping that functions do not. The conversion of the versionless wrappers to macros may alter the behavior, so revert that change. Task-number: QTBUG-96219 Change-Id: I4d0ddf035629651ba7048c1619a2833f03c7b756 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 3923c266bcd6e320b74c1aac37576d8a91f56125) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-061-1/+1
| | | | | Change-Id: Ia594b7e31a1243ccb0127b6e7d3e9e094e792edb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-041-2/+2
| | | | | Change-Id: Id490a7f16d60014feaa5ee8f71c8ce0508005f1e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-041-2/+2
| | | | | Change-Id: I8ee0fa7098131db1249e4165279278b96118913e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-041-2/+2
| | | | | Change-Id: I94ac5f92eb77cad104a1586af4542f2d07594cab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-031-2/+2
| | | | | Change-Id: Ib030a1a09c3f89e9d8a1949b0f9c230392e55b73 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-031-2/+2
| | | | | Change-Id: I39585ae555046a64fa8f42d55a1a18f6ef3b9ae0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-021-1/+1
| | | | | Change-Id: Ife34a6b767a7931cdff5945ac934bd24da6dc5ae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlv6.2.0-beta4Qt Submodule Update Bot2021-09-021-2/+2
| | | | | Change-Id: Iee025cbd1064dffe667cf27f587c65a8e6f43dc4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: I1214aa69807d646f5386e92fc01ded527fee7ef2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Ensure versionless wrappers do not introduce a new variable scopeCraig Scott2021-09-011-5/+4
| | | | | | | | | | | | | | | Using function instead of macro prevented the wrappers from being able to pass back any variables set in the wrapped function. In some cases, these variables were being explicitly passed back to the caller, but that isn't needed if you just make each wrapper a macro. This also makes things more future-proof because any newly introduced output variables will work without having to update the wrappers. Task-number: QTBUG-96121 Change-Id: I475a9680e038363b22cacde12c138e904a878f68 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 0d995353419ec4908a322ebae7b5797b8c758688) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: I44b4c4ec86c97ebb17070cbb6a78eed7c33460e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-311-2/+2
| | | | | Change-Id: I8a908ae7b591375d5591dc1021bf7d31a3154912 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-301-2/+2
| | | | | Change-Id: I40ae2384392f44d4aefa2867f842a2c4cbe80a8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Split Conan packages per Qt moduleIikka Eklund2021-08-266-135/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtscxml needs to produce split Conan packages per Qt module: - Qt6StateMachine - Qt6StateMachineQml - Qt6Scxml - Qt6ScxmlQml This is implemented as follows: - Each split package will have a separate conan build recipe - Each recipe will call: qt-configure-module(.bat) ... -- -DQT_BUILD_SINGLE_PACKAGE=<package> Where the <package> is one of the following per recipe: - qtscxml - qtscxmlqml - qtstatemachine - qtstatemachineqml The recipe uses Conan's supported way to inherit from a given base class via 'python_requires_extend'. The qt-conan-common package implements a base class for Qt leaf module recipes. The build steps in leaf modules are mostly identical so it makes sense to put those in the base class. Dependencies are read by the base class from the 'dependencies.yaml' which is the same file the CI system uses. Task-number: QTQAINFRA-4290 Task-number: QTBUG-94881 Change-Id: Idb56f8c6cfcfdbefc3426dd26d923a956c382ebe Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 61012c7e17908dde5ce937f52abe3ae87417f8a4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-251-2/+2
| | | | | Change-Id: I545adb01bc9b6a9b723b69156e7e3f78984c7896 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix iOS app builds that use QScxmlEcmaScriptDataModelPluginAlexandru Croitor2021-08-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QScxmlEcmaScriptDataModelPlugin project was setting the PRIVATE_MODULE_INTERFACE option which is not a recognized option for plugins, but because it came after LIBRARIES, the actual option name and the values that come after it got recorded as "regular" libraries. This in turn was passed to qt_internal_extend_target which /does/ recognize PRIVATE_MODULE_INTERFACE, but because there's no counterpart Private target for the plugin target (as would be needed for PRIVATE_MODULE_INTERFACE) the option and its values were silently discarded. Because qt_internal_add_plugin adds Qt::PlatformPluginInternal after arg_LIBRARIES (which had PRIVATE_MODULE_INTERFACE as an option), that means the Qt::PlatformPluginInternal dependency was also interpreted as to be used for the Private target and thus discarded. This means none of the bitcode flags meant to be applied to the plugin target were applied and linking of an application failed with ld '/qt/ios/plugins/scxmldatamodel/libqscxmlecmascriptdatamodel.a(mocs_compilation_Release.cpp.o)' does not contain bitcode. Remove the invalid PRIVATE_MODULE_INTERFACE option. Amends 9251d5c76fb57674e8b7d3491f064814c5e08b20 Fixes: QTBUG-95921 Task-number: QTBUG-95208 Change-Id: Iaa752aa29295464957934f6d9161c0b31b3970b8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e9f09a1deddcfca61cca561d8ee8ac89d8b0b946) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix headerdirs and sourcedirsVenugopal Shivashankar2021-08-231-3/+2
| | | | | | | | | | | | | | | | | | Apparently, the code has been reorganized a bit, but these config variables were still referring to old paths that do not exist. This change fixes these qdoc warnings: qt5/qtscxml/src/scxml/doc/qtscxml.qdocconf:37: (qdoc) warning: Cannot find file or directory: ../../imports/scxmlstatemachine qt5/qtscxml/src/scxml/doc/qtscxml.qdocconf:37: (qdoc) warning: Cannot find file or directory: ../../plugins/scxmldatamodel/ecmascriptdatamodel qt5/qtscxml/src/scxml/doc/qtscxml.qdocconf:42: (qdoc) warning: Cannot find file or directory: ../../plugins/scxmldatamodel/ecmascriptdatamodel Task-number: QTBUG-95860 Change-Id: Ib0ee7d9f2588aa42d3c94f9c610e3a82fffe5efb Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit d535490a7b4c09c897716532f7e00b44cab1cf17) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-211-2/+2
| | | | | Change-Id: Iaea60e424c4d0ec609434b8387d35732f27abfe8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-201-2/+2
| | | | | Change-Id: I4e0b22e81bc6085de215a96ca05e0dff4a28f8d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-191-2/+2
| | | | | Change-Id: I2451c6af35a308324c3f4f708aa2b0696453cbed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-181-2/+2
| | | | | Change-Id: I753701ba7747c6bc54a3a7965985ace5d489c3ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-171-2/+2
| | | | | Change-Id: I4d57d3cb81f1a42a4456d0b076a19f7c8d72c52a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-171-2/+2
| | | | | Change-Id: Icd6e25b0ec6ea750277ba9a7a7492360d97aa572 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-1729-29/+29
| | | | | | | | Task-number: QTBUG-95636 Change-Id: I821f412f9dbe11ae99ffd888a7ab2ba415ed9379 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 0a9952317c3d3fadc5cc7c7fbae191058b097bab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-161-2/+2
| | | | | Change-Id: Ia39008041fe146980442dbc06dd2c52cfdd74f9b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlv6.2.0-beta3Daniel Smith2021-08-121-2/+2
| | | | | Change-Id: I24b7a860e9808136339714be68be53b7be7702ea Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-111-1/+1
| | | | | Change-Id: Ic2b7a3fe00c60b2e63adbab7d9e22d94a2f674ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Use renamed qt6_add_plugin PLUGIN_TYPE optionAlexandru Croitor2021-08-101-1/+1
| | | | | | | | Task-number: QTBUG-95170 Change-Id: Ie2d9301b84a5f7dc0ddcd4a54d9f5a4739fc47e9 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 025a482974f10c49920b79d14c8fb71e36658378) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rename qscxmlc CMake optionsJuha Vuolle2021-08-105-18/+33
| | | | | | | | | | | | | | | | Renaming as a result of CMake API review. The old option names are still supported but marked as deprecated. [ChangeLog] Rename QSCXMLC_ARGUMENTS and OUTPUT_DIR CMake variables to be better aligned with other CMake APIs (OPTIONS and OUTPUT_DIRECTORY respectively). Task-number: QTBUG-95178 Change-Id: I8500dd4e1d992ccba7378d37cda65d9760558dc5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3baa625b2819fbf13dc6b512c377a1a5998ca7f9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-101-2/+2
| | | | | Change-Id: I3f948ebd5887d18a0080369de41ab3b899e322e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove QFont deprecation warningsJuha Vuolle2021-08-093-4/+4
| | | | | | | | | QFont(QString) constructor has been depreceated in Qt 6.2 Change-Id: Id507f5291500629e7d35342f94ca1539b7a3e52d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 39b593f83bbd6caaab44e55b491a8f9802968f55) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-041-2/+2
| | | | | Change-Id: I1008510ecfd7716af9f5426f1ed068a24ff8cfa0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-08-021-1/+1
| | | | | Change-Id: Idfcc4a1b0e436d30845e4259ca14bcce31e3ffc8 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-21 03:21:30 +0000