summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Drop the NOTIFY part from generated Q_PROPERTY macrosUlf Hermann2016-11-181-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are unnecessary for code completion and somewhat wrong because the signal methods don't actually exist. Change-Id: Ie5326791aaf574fffc9f38b3c6bc786c1204ab45 Task-number: QTBUG-57174 Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | Doc: Fix example trying to QObject::connect to a stateUlf Hermann2016-11-181-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | This doesn't work anymore. You need to use either macro based connect with SIGNAL(...) or connectToState(). Change-Id: If6a7b5057444ffdc20e3f4b40f0acd3d5d19bda6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | Update docs according to recent changesJarek Kobus2016-11-141-2/+2
| | | | | | | | | | | | | | | Change-Id: I5b2c8827bbfef749b51b904314ed822fdf150d20 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Fix docJarek Kobus2016-11-141-1/+1
| | | | | | | | | | | | | | | Change-Id: I406500e76deb4e0956aa671319bb01319012a7cd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Add docs for sudoku exampleJarek Kobus2016-11-145-4/+396
| | | | | | | | | | | | | | | Change-Id: I956a0c8d030475ff7ec00dabfeffd980918fde2a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Use std::is_same type traitKai Koehne2016-11-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This fixes compilation with qtbase commit ed7f77071dcc that removed the QtPrivate::is_same type trait. Change-Id: I8ad5279f234594ccad3663d9722bdb0102e4dc6a Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Further clean up qscxmlinvokableservice.hv5.8.0-beta1Ulf Hermann2016-10-2712-292/+296
| | | | | | | | | | | | | | | | | | | | | | | | We can group the various parameters passed around between the factories into a struct and we can move some methods into the private interface. Change-Id: I579ced7d501bdb617d4aefd47ced49746c9a5b94 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Document the fact that an event loop is requiredErik Verbruggen2016-10-272-0/+10
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-54010 Change-Id: I89d3cacf150b7ace11b54ad0f714a98d79eb87f3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Do not accidentally generate <::Erik Verbruggen2016-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | C/C++ uses <: as a digraph (for an opening bracket), so templateName<::namespaceName::className> would generate errors. Task-number: QTBUG-53719 Change-Id: I32890db75e56470befeae0866307a6421ca3f911 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * | Add a sudoku exampleJarek Kobus2016-10-1710-0/+674
| | | | | | | | | | | | | | | Change-Id: I08a0c053a195dd55e6ff796b89a19ee160eb152d Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Rename QScxmlParser to QScxmlCompilerUlf Hermann2016-10-1419-204/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | It creates an executable representation from an XML description, so it is a compiler and not merely a parser. The name should reflect this. Change-Id: I459445706207b3afae64b3f803c9beae83114bb6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Clean up qscxmlinvokableservice.hUlf Hermann2016-10-144-128/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is public API, so it should follow some minimal standards: * Use QObject's d pointer where possible * Follow the FooPrivate naming scheme for private classes * Don't expose any data members in the public interface * Give the various service classes somewhat logical names * Drop some #ifdefs (qscxmlinvokableservice.h isn't used for qscxmlc) Unfortunately we cannot drop any actual functionality from this header as we need all of it for the generated C++ code. Change-Id: Idd2698f7a331548eb1bf2d20da405a0fe05a92f0 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Simplify qscxmlexecutablecontent.hUlf Hermann2016-10-1415-73/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | The only things we actually have to export are a few structs and typedefs. As we have to keep this binary compatible we should strive to make it as simple as possible. Change-Id: I54d365530800c86ecc3d859d6daea94e05b893a0 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Use std::function for onEntry and onExit return typesUlf Hermann2016-10-148-55/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to drop the C++14 requirement. As onEntry and onExit are template functions we don't need to care about (not) using the standard library for them. Change-Id: Ie776e04f7e1771914c9f48d2440ef445d87d64c0 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Use QByteArray rather than QString for ftpclient exampleUlf Hermann2016-10-146-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | This makes the code simpler and relieves us of the need to assume any specific character encoding for the communication with the server. Change-Id: Icc31e963f95eeff4a13e69c3d25d6f0d400a9d13 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Rename QScxmlExecutableContent::Instructions and make byte code constUlf Hermann2016-10-148-95/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Instructions" was quite ambiguous as there are instruction IDs and instruction structs. It actually meant an array of IDs. The execution engine should never modify its byte code, so while we're at it, we can also make all relevant occurrences of InstructionID* const. Change-Id: I9370b07a5a9cdb8c7b41b23648fc1b8b2dea7dcd Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Doc: Fix the name of the QML moduleLeena Miettinen2016-10-122-2/+2
| | | | | | | | | | | | | | | | | | | | | All other QML module names include Qt. Change-Id: Id7469a9838f555fb6f618e8f85a5810414bd909a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-1146-89/+1619
|\| | | | | | | | | | | Change-Id: I63affb9e60fe0a412b8b05eddedee810879ac2ff
| * | State machine interrogation interfaceErik Verbruggen2016-10-0710-3/+636
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This interface can be used to get all states and transitions from an SCXML state machine. It will also signal which states are entered and exited for each microstep, and which transitions are taken by the microstep. Change-Id: I4bb936add6b3fd87a322093b8aee66521bb294a4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Doc: Add links to Qt Widgets and Qt Quick module docsLeena Miettinen2016-10-051-2/+2
| | | | | | | | | | | | | | | Change-Id: I9204dc77bb9395aa942b7251dfde4f9fc92ea3f3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Doc: Remove note about Qt SCXML being released as Technology PreviewLeena Miettinen2016-10-051-3/+0
| | | | | | | | | | | | | | | Change-Id: I6180ef6a01ed38c4b2ba00bafb243f665145e676 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Doc: Replace obsolete dependency "qtdeclarative" with "qtquick"Leena Miettinen2016-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ...to fix a QDoc warning and to enable linking to Qt Quick documentation. Change-Id: I917801b4ff6fc3d71747dbbc6cd7f42bff851328 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Re-enable building of examples on MSVCUlf Hermann2016-10-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Apparently the tests work on MSVC, so we should be able to also revert the examples side of 65964f13e9156b4ec26707d916f6f8e56582a024 . Change-Id: I0c876630b0b722870a141922f0bd5211ee46b5f4 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Update plugins.qmltypesUlf Hermann2016-09-2711-22/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, have the extended state machine type follow the usual naming scheme, and increment the minor version everywhere. Since we don't need to be compatible with 5.7 we don't need to drag the 5.7 version around at all. In addition, we also don't need to namespace QtScxml in any QML context and, using the additional type information, we can easily constrain the types of all state machiens in QML. The fromFile() and fromData() methods don't have to be Q_INVOKABLE and that just confuses qmlplugindump, do drop Q_INVOKABLE there. Change-Id: I7bd3f10ac458d64fcb98caece770b5d4c61abdb5 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Doc: fix code snippet in Mediaplayer QML Dynamic ExampleLeena Miettinen2016-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Apparently, the example code has changed. Change-Id: I69cd7da627a4ac3a3ac41435dd0aeedb1eb0a009 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Doc: Add docs for FTP Client exampleLeena Miettinen2016-09-263-0/+149
| | | | | | | | | | | | | | | Change-Id: Ifa1a02d0a36951dec7a956fe3cd2840dc55c8c28 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Replace Q_FOREACH/foreach with ranged-forErik Verbruggen2016-09-2512-55/+62
| | | | | | | | | | | | | | | Change-Id: I7b4d13a49577a7d984727722ff2ae4458eab2d6e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Add a simple FTP client exampleUlf Hermann2016-09-238-0/+629
| | | | | | | | | | | | | | | | | | | | | With the provided FTP client you can fetch text files via anonymous FTP. Change-Id: I622264d72aac71492bf474dc1936917fdc78d499 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-2338-234/+629
|\| | | | | | | | | | | Change-Id: Idfcfd01c2633d5632307de62ac85a0f5edcbbe33
| * | Clean up includesUlf Hermann2016-09-225-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | This will hopefully enable us to build qscxmlc with force_bootstrap on macOS. Change-Id: Ib5d9494fae86b9bb12625aadb9ae3fac0a234520 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Simplify QScxmlParserUlf Hermann2016-09-225-31/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is little point in exposing the intermediate steps of parsing, instantiating the state machine, and instantiating the data model to the user. One method to do all of this is enough and relieves us from the burden of maintaining binary compatibility for multiple poorly named extra methods. Also, drop addError(). Who wants to add errors to the parser from the outside? Change-Id: I4a2faba8c5f130e8a95675ebbdb747df7afdee73 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Make QML imports private on C++ sideUlf Hermann2016-09-2210-24/+69
| | | | | | | | | | | | | | | | | | | | | We don't want to maintain public API for those. Change-Id: I4ef9397b2e50329803e021abcb4cbef268b1e82e Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Remove unused methodsErik Verbruggen2016-09-211-29/+0
| | | | | | | | | | | | | | | Change-Id: I58f0ced2ab182f51037ff36db90b5b1e3ae5cbb3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Remove unnecessary attribute from qt_static_metacallErik Verbruggen2016-09-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attribute hides methods from exported classes. As this class is not exported at all, it is completely unnecessary. Worse, gcc 6 complains about it. Task-number: QTBUG-55940 Change-Id: I5461d0ddaaa387763698ec654cd54f3dc6a23920 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Change the initial state of a parallel state to contain all childrenErik Verbruggen2016-09-191-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't used, but when doing introspection on the statemachine, a transition in a parallel state with just one target states looks strange. Change-Id: I60f54ee26ebe3a067fe60897b314e5eae55bda76 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Use Q_ENUM instead of Q_ENUMS [-Wclazy-qenums]Sergio Martins2016-09-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I49c99c0b9e1b20f9652bb238f0a32bba7d3f5fd4 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * | Pass by const-ref in range-loop [-Wclazy-range-loop]Sergio Martins2016-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QScxmlStateMachinePrivate::InvokedService is not a trivial type, it's copy-ctor would be called every time. Change-Id: If57c26aca89005c0fec39fa8ce3d2eac150975a0 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | Change the type of generated states to "Synthetic"Erik Verbruggen2016-09-164-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to distinguish between "normal" external states and things like implicit initial states. Change-Id: Ifdecc2a18fee72d2b52c46348bb1c9b67e245716 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Don't generate empty switch statements for C++ data modelsUlf Hermann2016-09-142-44/+55
| | | | | | | | | | | | | | | | | | | | | Some compilers will complain about them. Change-Id: I82bee601480e43ce00657d609d30179fe17e6bdb Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Add git-archive export optionsAntti Kokko2016-09-132-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add .gitattributes, no export for .gitattributes and .gitignore Add .tag file to store the sha1 of the commit being packaged Change-Id: Ibfef46fa3327124a153a57f526af54ac131fb80d Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * | Add onEntry and onExit templates to QScxmlStateMachinesUlf Hermann2016-09-126-3/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | These help to avoid repeating "if (isInState) ..." if you only want to execute a handler when a state is entered, or "if (!isInState) ..." if you want to execute it only when a state is left. Change-Id: I0a73585591163dd2741b2d9d4897ee50e9623853 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Fix some parameter alignmentUlf Hermann2016-09-122-4/+5
| | | | | | | | | | | | | | | Change-Id: I4daf4e38d8d9661df6ee6eed9ee93d22db868b35 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | Doc: Fix the snippets in Traffic Light QML example docsLeena Miettinen2016-09-082-8/+6
| | | | | | | | | | | | | | | Change-Id: I8ddb470e61c5a19b8bd673d2b8e8d920e1f47efd Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * | Rename StateMachineLoader.filename to "source"Ulf Hermann2016-09-067-34/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's a URL, so it shouldn't be called filename. Otherwise people will try to use it with plain filenames, omitting the qrc:// or file:// prefix. Change-Id: I01be8515ba03c58c0dd1fce6b0e1e5fa413b9839 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | Clarify documentation for connectToEvent and connectToStateUlf Hermann2016-09-061-17/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | All of them return a handle to the connection, the functor and method based ones all require the receiver to take arguments, and the event specifications are not exactly the same as the ones specified by SCXML. Change-Id: I0938c795d9b44566943036157476a421a0896fbf Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | Fix some parameter alignmentUlf Hermann2016-09-061-8/+8
| | | | | | | | | | | | | | | Change-Id: I52bdab53a50479c33b8e6e624984a57974877988 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-0618-126/+243
|\| | | | | | | | | | | Change-Id: Iffb31f778cc2894c911d5405a7d8acc64f25650b
| * | Example: Final cleanup of trafficlightsThomas Hartmann2016-09-022-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | * The color for Window is not visible * The MouseArea to quit the application is not required * Removing unused alias properties Change-Id: Id7647e1a588581f238b2554b0c9d1c955757acdd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Examples: Using when in statesThomas Hartmann2016-09-022-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | We have to make the state machine available in the ui file, but now the syntax is declarative. Change-Id: I67fafa05c6c43eeb11d0788fc6ece66c3f853f95 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Examples: Use a proper type for the stateMachine propertyThomas Hartmann2016-09-022-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | This is required to get auto completion working in TrafficLight.qml. (At least for the static case) Change-Id: I9fd3ca64ff92b62cb30e0c66eab20c60995ff911 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 01:34:08 +0000