summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: State Qt versions for when CMake commands etc. were introducedJoerg Bornemann2022-02-101-0/+2
| | | | | | | | Task-number: QTBUG-100212 Change-Id: Iad5945934a6a113cbfe8e616db53b8bde01955c5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 955eb968e360654174080df9cd43518ac83bae55) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build with newer qtbaseFabian Kosmale2021-11-291-0/+1
| | | | | | | | | | qproperty.h is no longer transitively included Fixes: QTBUG-98738 Change-Id: I73b8e02fae554b844f53c63781f0bc7d5754542b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b874c82084dff4c3e2707cc077946de65be3d499) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* cmake: Ask CMake AUTOMOC to skip generated filesKevin Funk2021-10-111-1/+4
| | | | | | | | | | | | | | | | | | | | SKIP_AUTOUIC needs to be set as well to hide CMake warnings such as: ``` Policy CMP0071 is not set: Let AUTOMOC and AUTOUIC process GENERATED files. Run "cmake --help-policy CMP0071" for policy details. Use the cmake_policy command to set the policy and suppress this warning. For compatibility, CMake is excluding the GENERATED source file(s): ".../examples/qscxmldebugger/statemachine.cpp" ``` Change-Id: I6219f34467dbeda70dc6e371a6333339ea53e661 Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 6464114cb9edfcf905d4333fa6a19e4b84de2024) Reviewed-by: Qt Cherry-pick Bot <cherrypick_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>
* 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>
* 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>
* 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-102-9/+21
| | | | | | | | | | | | | | | | 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>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. Task-number: QTBUG-90819 Change-Id: Ia7a8f27d4eecf067055511577ec664ad857905cd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit d3e6fdfaf2bbdbbb7ed8e2fdca7210ba4f757a8f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtscxml: Add QtQml dependencyMaximilian Goldstein2021-06-211-0/+2
| | | | | | | | | The QtScxml module needs QtQml as a dependency or else tooling is not able to properly resolve its types. Change-Id: Ib9e8d7349e6fc0a43c6690c79d30e985ca0e856c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 66e9946247600657570bcd2c6a53d90fc857402f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* statemachineqml: Add QtQml dependencyMaximilian Goldstein2021-06-211-0/+2
| | | | | | | | | The statemachine module needs QtQml as a dependency or else tooling is not able to properly resolve its types. Change-Id: I436456ba9e9351d04af0364fc98618a44e634edd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 1182a4acded8f19d803a1aac626170d5f9ddcd7d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove old configure-related filesJoerg Bornemann2021-06-172-39/+0
| | | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Task-number: QTBUG-89536 Change-Id: Ib0c67ef861216f4d64a00c80ed0a9366eab8f262 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 782a5948f0d38d77c9f0d2c1ce951cc8cedb540a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Do not invoke bound signals with QList<QVariant>Ulf Hermann2021-06-101-2/+26
| | | | | | | | | | This method has been removed in QtQml. Fixes: QTBUG-94386 Change-Id: Id3f95787dd34df61e89e71b7ec700e1cbbf1b3f1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 805eb53f97b0eb3ee71ada360c56cca10dc827bf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Define repo target sets for the conan buildJoerg Bornemann2021-06-075-0/+10
| | | | | | | | Define the repo target sets qtscxml, qtscxmlqml, statemachine and statemachineqml. Change-Id: Id6ad659c942926e71027a108b9089d92bc5b2274 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Update to latest qml CMake APIAlexandru Croitor2021-06-059-202/+10
| | | | | | Task-number: QTBUG-91621 Change-Id: Iac28e71b7e581aa7199d4d3b3890b6d5f9d6c8eb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove mentioning of possible third-party licensesKai Köhne2021-06-021-6/+0
| | | | | | | | There are currently none :) Pick-to: 6.1 Change-Id: I4c253d7d1cb2980d2174e7d0eead4795455dcff7 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix autotest compilation error on Windows/MinGWJuha Vuolle2021-05-261-0/+5
| | | | | | | | | | | | For some reason with MinGW the statemachine code generation failed silently if the provided output directory (where to store the generated .h and .cpp files) did not exist. This commit creates the directory and also adds a warning if nonexistent directory is tried to use. Pick-to: 6.1 Change-Id: I161d7646b4be5bf52fd045d0bf124ab2f8987668 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix naming of plugin classes, targets and filesUlf Hermann2021-05-0711-25/+21
| | | | | | | | | | | | | | | The names should be the same so that the static version of the plugin can be included. It's also good to follow the naming conventions established by other plugins. Also, avoid multiple inheritence on the plugin interface by making the interface itself a QObject. Furthermore, QScxmlDataModelPlugin, being a private class, should be privately exported. Fixes: QTBUG-93458 Task-number: QTBUG-93444 Pick-to: 6.1 Change-Id: Ifbb3b062c922b79d8e55469349a64304a7a3fdd2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add QtStateMachine QKeyEventTransition & QMouseEventTransition bindablesJuha Vuolle2021-05-038-27/+78
| | | | | | Task-number: QTBUG-91375 Change-Id: I4538aead93fca999a8dd28ea5eaf8cbca5429c7d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QtStateMachine bindable support to QEventTransition propertiesJuha Vuolle2021-05-033-19/+47
| | | | | | | Task-number: QTBUG-91375 Change-Id: I67d92304029032f45daa0db2f2708e41205fefe8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* QtScxml bindable support to QScxmlDataModel::stateMachineJuha Vuolle2021-05-033-8/+30
| | | | | | Task-number: QTBUG-89895 Change-Id: I11f1caec9eee9b9767691c93e4deb0dbf57be496 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QtStateMachine QML-facing properties' bindable support part 5Juha Vuolle2021-05-036-19/+45
| | | | | | | | | | This commit covers these QML-facing classes: QAbstractTransition, QStateMachine Task-number: QTBUG-91375 Change-Id: I3c7d4244a4113c6ea0b06fedde02d638fc558ccc Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* QtStateMachine QQmlListProperty bindablesJuha Vuolle2021-05-037-18/+101
| | | | | | | | | | | | | | The commit uses 'mutable' and 'const_cast' to able to serve the bindable property without creating an additional copy (== avoid additional memory usage). These are flagged with a comment around them and in future we may be able to remove them as the bindable support evolves. Task-number: QTBUG-91375 Change-Id: I91f3c823eac1979628731853e20ed82a34636d99 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* QtStateMachine QML-facing properties' bindable support part 4Juha Vuolle2021-05-032-8/+9
| | | | | | | | | | This commit covers these QML-facing classes: TimeoutTransition Task-number: QTBUG-91375 Change-Id: I84c1cde2c9f7574f527d0d362984b1b0fe59802c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* QtScxml QML-facing properties bindable support additions part 2Juha Vuolle2021-05-033-7/+22
| | | | | | | | | | This commit adds the bindable support to following QScxmlStateMachine properties: invokedServices Task-number: QTBUG-89895 Change-Id: Ib9806e295f8aa7c1d3eb123cd3a151796a3a7c80 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* QtScxml QML-facing properties bindable support additions part 1Juha Vuolle2021-05-033-48/+115
| | | | | | | | | | | This commit adds the bindable support to following QScxmlStateMachine properties: initialized, initialValues, loader, dataModel and tableData Task-number: QTBUG-89895 Change-Id: I33545d9d45a4fbf52a4a220d559b7ee75351a268 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QtStateMachine QML-facing properties' bindable support part 3Juha Vuolle2021-05-034-14/+48
| | | | | | | | | | This commit covers these QML-facing classes: QSignalTransition Task-number: QTBUG-91375 Change-Id: I0f55f55c5198d30260762583ec10d35351e217b6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* QtStateMachine QML-facing properties' bindable support part 2Juha Vuolle2021-05-033-17/+36
| | | | | | | | | | This commit covers these QML-facing classes: SignalTransition Task-number: QTBUG-91375 Change-Id: I58bca7b4599b420aa99492233f9d88ea4af7e877 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QtStateMachine QML-facing properties' bindable support part 1Juha Vuolle2021-05-0310-55/+127
| | | | | | | | | | | This commit covers these QML-facing classes: QHistoryState QState QAbstractState Task-number: QTBUG-91375 Change-Id: Ic66977c4f25198c19052f48754a956042caa3632 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QtScxml QML-facing properties bindable supportJuha Vuolle2021-05-035-73/+144
| | | | | | | | | | This commit adds the bindable support the QML facing properties that were feasible for such support. Task-number: QTBUG-89895 Change-Id: Ia8c9ada1c4bf9f14a1460363e79befd82975539d Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QScxmlEventConnection bindable supportJuha Vuolle2021-05-032-20/+40
| | | | | | | | | QScxmlEventConnection is a class exposed for QML use Task-number: QTBUG-89895 Change-Id: I315c1e460cc01a57f841e832385959ef36618e91 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* signaltransition: Add QML_CUSTOMPARSERMaximilian Goldstein2021-04-281-0/+1
| | | | | | | Marks this element as using a custom parser for use in tooling. Change-Id: Ibbdafcad45930e3e9b4ea1b066f129c4704a0151 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Remove GENERATE_METATYPES usageMaximilian Goldstein2021-04-272-2/+0
| | | | | | | We now generate metatypes by default and every instance of GENERATE_METATYPES now causes a warning. Change-Id: Ie4ca9567e62077b6a77d8c2e125ada7e60fc5cbd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* qt6_add_statecharts cmake macro documentationJuha Vuolle2021-04-191-0/+51
| | | | | | | | | | | | The aim is to include the macro to Qt6 cmake command reference. The commit also improves the macro's documentation which was a bit of a mix-and-match and not fully documented in the central location. Pick-to: 6.1 Task-number: QTBUG-82460 Change-Id: Ia9cfa50df5af9872779d015894e914a7d45bb8c1 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* CMake: Fix qml module version to use the repo project versionAlexandru Croitor2021-04-154-4/+4
| | | | | | | | | | | Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the repo project version is used in a top-level build, rather than the version of the qt5 project. Pick-to: 6.1 Task-number: QTBUG-92861 Change-Id: I544496fcb0d7e4963d67d1908ef44fb1c84e0264 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Only hightlight one exampleAlex Blasche2021-04-141-2/+1
| | | | | | | | | | There are too many highlighted modules in the complete module list already. Otherwise highlighting becomes meaningless. Change-Id: I42ad5bc4a605666ac8433ebb4d589c51ef2907c9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Install qmake scxml compiler to allow STATECHARTS directive in Qt6Juha Vuolle2021-04-091-10/+5
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-92494 Change-Id: I7641adb5ac890a22a11f422466791c9195cab119 Reviewed-by: Tamas Martinec <tamas.martinec@symbio.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Name and mark the scxml datamodel plugin headers as privateJuha Vuolle2021-03-3111-68/+69
| | | | | | | | | | | | | | The plugin usage is an internal implementation detail. [ChangeLog][QScxmlEcmaScriptDataModel] The QScxmlEcmaScriptDataModel class is no longer part of the public API. This relates to moving the ecmascript datamodel's QML dependency from build time to runtime. Pick-to: 6.1 Task-number: QTBUG-89831 Change-Id: Ia24ec098494ed52d003614f76e2011be2efd3f51 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Qt SCXML: Fix HistoryState crashTamas Martinec2021-03-261-2/+10
| | | | | | | | | | | | Use the initial state of the parent state as the transition of a history state, if the parent state of the history state was not entered before. Pick-to: 6.1 Task-number: QTBUG-89845 Fixes: QTBUG-76091 Change-Id: I4c8a5898406bdf2931424b3cf012e42e422431ae Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix the "Could not resolve QML import statement" qdoc warningTamas Martinec2021-03-221-1/+0
| | | | | | | Pick-to: 6.1 Task-number: QTBUG-89834 Change-Id: I8c3926c10269fed8c823eee9f8d2fe4552b6412e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* QtScxml: Fix spelling in example documentationTamas Martinec2021-03-101-1/+1
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-89834 Change-Id: I6d24eeeddaac69ed2f4c74c77344452dee457a78 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Documentation to reflect the qscxmlecmascriptdatamodel code locationJuha Vuolle2021-03-032-3/+5
| | | | | | | | | | Additionally qdoc-mark the pluginKey as the parameter Pick-to: 6.1 Task-number: QTBUG-89831 Change-Id: I6792ce3e87fb650f33ba0c7730983ce0de50cd48 Reviewed-by: Tamas Martinec <tamas.martinec@symbio.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Replace discouraged Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPEAndreas Buhr2021-03-031-1/+1
| | | | | | | | | | | | | | Q_MOVABLE_TYPE was conceived before C++ had move semantics. Now, with move semantics, its name is misleading. Q_RELOCATABLE_TYPE was introduced as a synonym to Q_MOVABLE_TYPE. Usage of Q_MOVABLE_TYPE is discouraged now. This patch replaces the last usage of Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE in QtScXML. As the two are synonymous, this patch should have no impact on users. Task-number: QTBUG-86829 Change-Id: Ia4af0fd121d4e7457dbe2975f24a36ebc8b16b1d Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Add const to QSignalTransition::senderObject QObject*Juha Vuolle2021-03-024-6/+13
| | | | | | | | | | | | | | | | | The setSenderObject() takes in a const QObject* whereas the getter senderObject() returns non-const QObject*, and the related Q_PROPERTY is defined as non-const QObject*. This asymmetric API was introduced in 8b032fe423e854428c1c8324dcd0f8c6150b3503 (qtbase), and is a candidate for causing undefined behavior. This commit changes both the getter and the related Q_PROPERTY to also be const QObject*. Pick-to: 6.1 Task-number: QTBUG-89832 Change-Id: I691da8e90f750b0d73f8f532da6d040bb8941eab Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove qtcxml repo qmake build support (examples excepted)Juha Vuolle2021-02-2214-231/+1
| | | | | | | | | | | | | | | | | Remove qmake support by removing *.pr? files, with some exceptions: - Keep qmake support for the examples - Keeps qscxmlc.prf to retain STATECHARTS support for .pro files Also remove: - "#special case" and "# Generated from" comments from cmake files - .prev_CMakeLists.txt files Note: configure.json files are still kept as they still used to generate the configure.cmake Pick-to: 6.1 Task-number: QTBUG-89828 Change-Id: Ie9c7e86d099bbdc535f52b9f3e841fcf3973ca36 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add license and module change information to QtScxml documentationJuha Vuolle2021-02-221-0/+18
| | | | | | | Pick-to: 6.1 Task-number: QTBUG-89833 Change-Id: Ide7352ff5a527621775c6b45cf6db6c71a19a66c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Qt State Machine standalone documentationJuha Vuolle2021-02-1741-178/+556
| | | | | | | | | | | | | The Qt State Machine was carved off of the qtbase and qtdeclarative repositories and relocated to the qtscxml repository as a neighbor of the scxml state machine. As such the Qt State Machine had several fragments of existing documentation, but no qdoc packaging to make them work as a standalone documentation. This packaging and related necessary changes is the essence of this commit. Pick-to: 6.1 Task-number: QTBUG-89833 Change-Id: I43d8f8145d4467bd48dbf4674fa28a29671de868 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add missing example imagesJuha Vuolle2021-02-173-0/+0
| | | | | | | Pick-to: 6.1 Task-number: QTBUG-89833 Change-Id: I156e6fc9ad891650c7182453f20e17a2984b4422 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Obsolete qdoc file (some of its contents shall be picked elsewhere)Juha Vuolle2021-02-171-371/+0
| | | | | | | Pick-to: 6.1 Task-number: QTBUG-89833 Change-Id: I6b20d3d5284412f16ebac81dbd6dd5575eac7e98 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 13:53:12 +0000