summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-05-221-2/+2
| | | | | Change-Id: I7ffe1ddeb41153d98fb0630da2705dda4459a4c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-05-191-2/+2
| | | | | Change-Id: Ia0bf43f345225dd0ddc29d93f01ffdee43dd9f62 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-05-171-2/+2
| | | | | Change-Id: Ibd26e72193a7f47f9278d7a49e7310c4ea32a10a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-05-121-2/+2
| | | | | Change-Id: Ic1c4adcf9e739b1aa6e36c2c83a87989683dac2b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port QScxmlStateMachine to makeCallableObject helpersVolker Hilsheimer2023-05-122-144/+77
| | | | | | | | | | | | | Simplify and collapse the overloads using QtPrivate::makeCallableObject. As a side effect, this prevents connections to QObject member functions with incompatible prototype, which previously would compile, and then crash. Adjust and simplify the documentation to hide all the implementation details for overload selection. Change-Id: I163db6683f5c791faef37bfcab0ee3572a44d1b7 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Adapt to QSlotObject changes in qtbaseVolker Hilsheimer2023-05-101-4/+4
| | | | | | | | | Adapt to changed signature of the QFunctorSlotObject type, and replace QSlotObject with QFunctorSlotObject. Change-Id: I567e82cb871ba57eadbf4b8bced3e8ca15f0deae Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-05-101-2/+2
| | | | | Change-Id: I080f7286bb9c2af19b8edc5524bdecab3c4227a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add the use of the qt_internal_project_setup functionAlexey Edelev2023-05-031-0/+1
| | | | | | | | | The function sets the required CMake variables and policies. Pick-to: 6.5 Task-number: QTBUG-112685 Change-Id: I4c68c4c919e14cc797a682e6348aab2630e645e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-05-021-2/+2
| | | | | Change-Id: Ic81cf7398877b3c19486d699ad823dff3b5046a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-04-271-2/+2
| | | | | Change-Id: I278ade3a11a91d9a9bfe49a68d50f2b47249b744 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-04-241-2/+2
| | | | | Change-Id: I83624dc12468aa3b87c13182c34a81293d501d3b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-04-201-2/+2
| | | | | Change-Id: I46efc50909a1f7f878c09739b581b8af107b996e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* statemachine examples: Remove "Example" from application namesIevgenii Meshcheriakov2023-04-204-4/+4
| | | | | | | Task-number: QTBUG-111448 Pick-to: 6.5 Change-Id: I2b014f964a7a0eca8aea77042eebccf30fb74b0e Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* trafficlight example modernizationIevgenii Meshcheriakov2023-04-201-36/+35
| | | | | | | | | | | | | | | | | | | | | Add 'explicit' to some constructors. Use inline class member initialization where possible. Reformat some code using clang-format. Add Q_OBJECT macros to QObjects. Pass entire rectangle to QPainter::drawEllipse(). Use 'auto' where appropriate. Add module prefix to Qt includes and sort them. Pick-to: 6.5 Task-number: QTBUG-111448 Change-Id: Ibfb49608b5f3710684b2b07d29b14ad03a8dfb24 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* pingpong example modernizationIevgenii Meshcheriakov2023-04-201-26/+26
| | | | | | | | | | | | | | | | | Use constexpr to declare custom events. Reformat the code in some places using clang-format. Use qInfo() instead of std::cout. Use 'auto' where appropriate. Use per-class includes. Pick-to: 6.5 Task-number: QTBUG-111448 Change-Id: I76222fd91663828bff7e5bab8187845627615521 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* moveblocks example modernizationIevgenii Meshcheriakov2023-04-201-86/+69
| | | | | | | | | | | | | | | | | | | | | | | Remove unused StateSwitchEvent constructor that was leaving m_rand uninitialized. Use constexpr instead of anonymous enum to declare a custom event. Reformat the code in some places using clang-format. Use inline class member initialization. Add 'explicit' to some constructors. Use 'auto' where appropriate. Use per-class includes. Pick-to: 6.5 Task-number: QTBUG-111448 Change-Id: I7cdf243ccae25114c7ffa67dd75f981bfeac759f Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* rogue example modernizationIevgenii Meshcheriakov2023-04-205-54/+52
| | | | | | | | | | | | | | | | | | | | | | Use 'auto' where appropriate. Use constexprs instead of defines for WIDTH/HEIGHT. Use inline class member initializations, update the documentation accordingly. Use QT_FORWARD_DECLARE_CLASS for Qt classes. Use clang-format to reformat the code in some places. Use std::hypot() for distance calculation. Use per-class includes and sort them. Pick-to: 6.5 Task-number: QTBUG-111448 Change-Id: I52d67fa63e53ce598200067bb283139e5bf9be4b Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* rogue example: Simplify font setupIevgenii Meshcheriakov2023-04-201-15/+2
| | | | | | | | | | Use QFont::TypeWriter style hint insted of searching all the font families. Task-number: QTBUG-111448 Pick-to: 6.5 Change-Id: I14188c7b99fc0048d3f60752f1a332c8f814d278 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-04-121-2/+2
| | | | | Change-Id: I9f6b02c6a7518d543b18eed805385beb7b9da180 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* statemachine examples: Remove images left from removed examplesIevgenii Meshcheriakov2023-04-127-0/+0
| | | | | | | | | This amends 236d927705defbf58a6b410befcf73a141d06c4e Task-number: QTBUG-111447 Pick-to: 6.5 Change-Id: I552592433738642b4d4b945120391dac8ea30d69 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* statemachine examples: Cleanup .pro filesIevgenii Meshcheriakov2023-04-123-6/+2
| | | | | | | | | Remove trailing spaces and useless backslashes. Pick-to: 6.5 Task-number: QTBUG-111448 Change-Id: I699fd723977aa8cf8566bcbe0f35394822b3d808 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* statemachine examples: Modernize CMake filesIevgenii Meshcheriakov2023-04-124-12/+12
| | | | | | | | | | | Use qt_standard_project_setup() instead of setting CMAKE_AUTOMOC. Link Qt libraries as PRIVATE. Pick-to: 6.5 Task-number: QTBUG-111448 Change-Id: I9451bbd5cbeaaf71aaa5125a3de7cd3440651cb3 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* Doc: Use the \examplecategory macro to tag examplesTopi Reinio2023-04-111-1/+1
| | | | | | | | | | | | | | | | The '\meta category' command was used for tagging examples with a specific category, used in Qt Creators Welcome mode. As we want to also generate lists of examples belonging to a category elsewhere in the documentation, replace the command with a macro that expands to the original \meta command and also adds the example to a group using the \ingroup command. This way, the category names can be used as arguments to the \generatelist or \annotatedlist commands. Pick-to: 6.5 Task-number: QTBUG-112731 Change-Id: Icc5b00c25f1d105269ecbf5b92bea53e93298f48 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-04-111-2/+2
| | | | | Change-Id: Ie09a4e3aae67a4f04202a75fc68a15865e724e56 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-04-051-2/+2
| | | | | Change-Id: Ic50f4306b47c9e0aaa916c4899f402a71c1fd5bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-04-041-2/+2
| | | | | Change-Id: I2465b2a315d87063883eaaf25bf08c6dcee23e90 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-03-281-2/+2
| | | | | Change-Id: I577fcc1a68fd4694f76b23a2eca50c78b044ace3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-03-201-2/+2
| | | | | Change-Id: I1e2e151750aaba1d82d77467e8009ff30e9e7a9f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add category to the SCXML examplesJuha Vuolle2023-03-174-0/+5
| | | | | | | Pick-to: 6.5 Task-number: QTBUG-111323 Change-Id: Id113d413ada2ec2207f6b289da4b283f1201a342 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Revamp scxml trafficlight examplesJuha Vuolle2023-03-1739-320/+424
| | | | | | | | | | | | | | | | | | | In addition to general modernization, this commit changes the trafficlight structure slightly so that the qml-static and qml-dynamic variants have their own copies of the QML files. This way the examples remain standalone examples whilst using the contemporary qt_add_qml_module, without needing to introduce a shared common QML module. A shared common QML module is a viable option but would unnecesarily complicate example build/link/deployments. Pick-to: 6.5 Task-number: QTBUG-111323 Change-Id: I7a289db2d2927d97438556362e4b2eff53821020 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Revamp scxml ftpclient exampleJuha Vuolle2023-03-178-23/+25
| | | | | | | Pick-to: 6.5 Task-number: QTBUG-111323 Change-Id: Ie6b75b2712ecd16defc216d00ab39b7e9f8045cd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Revamp scxml sudoku exampleJuha Vuolle2023-03-177-48/+38
| | | | | | | Pick-to: 6.5 Task-number: QTBUG-111323 Change-Id: Ica1979864662d36682db9195add36d167fe9264a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Revamp scxml mediaplayer exampleJuha Vuolle2023-03-1711-52/+80
| | | | | | | Pick-to: 6.5 Task-number: QTBUG-111323 Change-Id: I817c1f7ee10027964e9247dac1ad242d42c2d77b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Revamp invoke exampleJuha Vuolle2023-03-1712-70/+101
| | | | | | | | Pick-to: 6.5 Task-number: QTBUG-111323 Change-Id: If4549b346a824873753f512a4e3c7d4ccc2b1f88 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Revamp calculatorscxml exampleJuha Vuolle2023-03-179-50/+74
| | | | | | | Pick-to: 6.5 Task-number: QTBUG-111323 Change-Id: I5f39ab281edde826d50c133a9d6a6d7fe9d85baa Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Disable problematic tests on WASMMikolaj Boc2023-03-157-0/+28
| | | | | | Task-number: QTBUG-109786 Change-Id: Ibd679d64d44c549d62015454f11aaf5bc75f2d45 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add Axivion configMatti Paaso2023-03-151-0/+63
| | | | | | Task-number: QTQAINFRA-5244 Change-Id: I47b359b4926011413edd738b2b4633efdb5c00a8 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-03-111-2/+2
| | | | | Change-Id: I2ca1da1a5e7a330618d8441ebb0488c36505be6b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix tst_scion when batchingMikolaj Boc2023-03-101-6/+4
| | | | | | | | | | tst_scion uses raw target_sources calls. These are repaced with qt_internal_extend_target, which handles the case when a test has been batched. Task-number: QTBUG-109786 Change-Id: I7f6bf28100328c7b873ca94673654341824bd55a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Flatten the state machine example directory structureJuha Vuolle2023-03-1027-86/+55
| | | | | | | | | | | | | The split into "animation" "graphicsview" and "statemachine" sub-directories is a reminiscent of the times when the examples were in qtcore, and as such not very meaningful when state machine is in a separate repository. In addition remove similarly inherited READMEs. Pick-to: 6.5.0 6.5 Task-number: QTBUG-111447 Change-Id: I8f3d977512fdc239bf3dede341f69788df0a09f4 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove some of the state machine examplesJuha Vuolle2023-03-10161-9487/+7
| | | | | | | | | | As part of the Qt6 example revamp campaign. See QTBUG-110646 for more detailed rationale Pick-to: 6.5.0 6.5 Task-number: QTBUG-111447 Change-Id: I9757daed4a3e60a15cc0b557c14e51862c6b0bf7 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-03-021-2/+2
| | | | | Change-Id: Ifaf78de47ce66c212ca6b5398f759a03a5510bc8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make the mediaplayer target name unique to avoid conflicts in top-level buildAlexey Edelev2023-02-281-6/+6
| | | | | | | | | | | Rename the scxml 'mediaplayer' target to 'mediaplayerscxml' Amends 1eb77736b2e72bfcbdc356e183e3cbb0f09d71a1 Task-number: QTBUG-111090 Pick-to: 6.5 Change-Id: I744624cb2b7547f03a8867b28f0301b1431b64c0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Make the calculator target name unique to avoid conflicts in top-level buildAlexey Edelev2023-02-281-6/+6
| | | | | | | | | | | Rename the scxml 'calculator' target to 'calculatorscxml' Amends 7801e05e659845ccc163c7e473ed4d91fa1de778 Pick-to: 6.5 Task-number: QTBUG-111090 Change-Id: Ic86f342a4407b9b79896262d8f990b8eb3536e4d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2023-02-241-2/+2
| | | | | Change-Id: I3b91447b50db57cd9d48b183cbe38415061bf820 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Adjust the example namesJuha Vuolle2023-02-2311-18/+18
| | | | | | | | | | | According to current example conventions in https://wiki.qt.io/Qt6/Example-Guideline#Naming_the_example Pick-to: 6.5 Task-number: QTBUG-111323 Change-Id: Ib7f13bd1a147168c6df13b126daac4bf1daf405d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Adjust the example landing page doc descriptionJuha Vuolle2023-02-231-11/+6
| | | | | | | Pick-to: 6.5 Task-number: QTBUG-111090 Change-Id: I20b5f98aa190f2f13bc1a2764a48d6afbf37ae8b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Adjust the brief description of the sudoku exampleJuha Vuolle2023-02-231-3/+1
| | | | | | | | | To reflect the technically unique aspect it demonstrates Pick-to: 6.5 Task-number: QTBUG-111090 Change-Id: I7f7558202292ff613a67b6c64cdab8368854dd94 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Simplify calculator example to just one example variantJuha Vuolle2023-02-2321-499/+36
| | | | | | | | | | | | | | The calculator example is a rather generic SCXML example, but provides demonstrative value as it implements the calculator from the SCXML specification. This commit removes the widget variant and renames the remaining QML variant as plain "calculator". Pick-to: 6.5 Task-number: QTBUG-111090 Change-Id: I6ecdbe9de49fd357c91e25c9d0fe31fdd7958d7e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove invoke-dynamic example and rename invoke-static to plain "invoke"Juha Vuolle2023-02-2323-278/+91
| | | | | | | | | | The primary purpose of the example is to demonstrate invoking, and one example variant is probably adequate. Pick-to: 6.5 Task-number: QTBUG-111090 Change-Id: I1f8a64be3bb82c9663687b7f37cf6682e0626060 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 16:46:02 +0000