summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Update plugins.qmltypesv5.13.0-beta3Kai Koehne2019-04-121-12/+13
| | | | | Change-Id: I0ad674b4855ebf0152a2c13a354fc06a14c11b46 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Automatically register the latest import versionKai Koehne2019-04-123-1/+6
| | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 1.14 in Qt 5.14) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Change-Id: Ibe271d4814032fe758545abd31573220ed84b5f8 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix coding style issuesJarek Kobus2018-05-021-2/+2
| | | | | Change-Id: Iaac75c72d5ddb61ebf443acdffad9a14c83aeaf3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Use nullptr instead of 0Jarek Kobus2018-05-023-4/+4
| | | | | Change-Id: I94da16599d11c4877cff4e38c9d91799737a653a Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
| | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Id7ef0308bdc029377e3e6c605feff91c1defb231 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-1/+12
|\ | | | | | | | | | | | | Conflicts: src/scxml/qscxmlcompiler.cpp Change-Id: I4abda984e523cdf2a0810ed7dc1773e055746e18
| * Properly convert URLs to local files in QML state machine loaderUlf Hermann2017-08-171-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | toString() doesn't do what we're looking for. "file:" URLs can be readily converted to local files, "qrc:" URLs can be converted by prepending a ":" to their path component. All others cannot. In order to support those, we'd have to extend QScxmlCompiler to accept generic URLs rather than file names, and then we still might not be able to actually resolve relative file names from <invoke> tags. Change-Id: I138318e8abd87e6e097445f77148668439ff980c Task-number: QTBUG-62178 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-271-5/+5
|/ | | | | Change-Id: I6bee476e2f467b57ee8e4bba1e780cf79c7a460e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix bundling of module for static buildsv5.9.0-beta4Julian Strobl2017-05-051-0/+8
| | | | | | | | | | | | | | Without this patch the module is not bundled in static builds correctly causing 'module "<QtModule>" is not installed' errors in during runtime. As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)' at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false', which indicates that the module was not registered. Task-number: QTBUG-59559 Change-Id: If57fca92a0e04b9e04f1adb59dae0e4e9a3dcccb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Doc: Fix QML property types and method signaturesv5.9.0-beta1Leena Miettinen2017-03-233-6/+8
| | | | | Change-Id: I2b7897015a743cf70847270117ada881559ce7c9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Doc: Add docs for the InvokedServices QML typeLeena Miettinen2017-03-211-0/+33
| | | | | Change-Id: I87279e065b7ea3ca7bcd9100bc2d36a5e5b677c9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Doc: Add docs for the EventConnection QML typeLeena Miettinen2017-03-211-0/+37
| | | | | Change-Id: I0b4c93797fa076e6360c92badea551b01acef644 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Doc: Remove docs for property changed signalsLeena Miettinen2017-03-211-13/+2
| | | | | | | The convention is not to document them. Change-Id: I9d133e05a4d2b15b47bfb3ce06b07c661534a17c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-103-8/+8
|\ | | | | | | Change-Id: I467bf942ab818d350a1c08c8567566b9bbfcb5a5
| * Switch to using QQmlExtensionInterface IDRobin Burchell2017-02-081-1/+1
| | | | | | | | | | | | | | | | This is required by tst_qqmlextensionplugin, and was wrong in scxml. Change-Id: I4c7bc12306a218724db5939a8a2c996cd7c092fe Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Reformat include statements in accordance with coding conventionsUlf Hermann2017-02-083-7/+7
| | | | | | | | | | | | | | | | | | Also, drop the QStateMachine includes. We certainly don't need them anymore. Change-Id: I1fe99162c68668858024516f937ee66ca6eff0bc Task-number: QTBUG-58658 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | statemachineloader: Use the newly-introduced qmlWarning instead of qmlInfoRobin Burchell2017-01-131-5/+5
|/ | | | | | | | | | | qmlInfo will shortly be returning info-level messages (as the name hints), rather than warning level messages. While I'm here, tiny drive-by to remove the unnecessary "ERROR" prefixes on some of the warnings. Change-Id: Ia615e378f295893066ca437fa6cf5afb7213668e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Doc: Fix the name of the QML moduleLeena Miettinen2016-10-121-1/+1
| | | | | | | All other QML module names include Qt. Change-Id: Id7469a9838f555fb6f618e8f85a5810414bd909a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update plugins.qmltypesUlf Hermann2016-09-272-5/+123
| | | | | | | | | | | | | | | 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>
* Replace Q_FOREACH/foreach with ranged-forErik Verbruggen2016-09-252-4/+5
| | | | | Change-Id: I7b4d13a49577a7d984727722ff2ae4458eab2d6e Reviewed-by: Ulf Hermann <ulf.hermann@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>
* Rename StateMachineLoader.filename to "source"Ulf Hermann2016-09-063-30/+33
| | | | | | | | | 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>
* Replace runningSubStateMachines() with invokableServices()Ulf Hermann2016-08-304-26/+27
| | | | | | | | | | | SCXML allows for different kinds of services, not only other state machines. We might add support for them in the future. From invoked state machines you can always get the actual state machine via the respective property. To make this easily accessible, we make the invoked services QObjects. Change-Id: Idd07783730bc98bded404dc2c2c3bd241180c1f4 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Expose sub state machines through a QVariantMapUlf Hermann2016-08-184-2/+186
| | | | | | | | | We define a separate SubStateMachines component with a "children" property that provides the parent state machine's children indexed by name. Change-Id: Ic30ca8fadee6bd608e61307b2ca32474effe580f Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Add a QML default property for QScxmlStateMachineUlf Hermann2016-08-184-2/+129
| | | | | | | | | The extension object will be injected into any state machine constructed from QML. This way child QML objects can be added to a state machine without explicitly declaring properties. Change-Id: If8ec048137cbfb88c3317dee6f626a1cb74248dc Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Doc: Describe the StateMachineLoader::stateMachineChanged() signalLeena Miettinen2016-08-181-0/+3
| | | | | Change-Id: I0d775b9bfd1f0dc264060359757eba0ed2b88778 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Better connection mechanism for eventsUlf Hermann2016-07-144-2/+195
| | | | | | | | | The connectToEvent() mechanism is analogous to connectToState() and allows arbitrary event specifications, with '.' and '*'. In addition a QML component is provided to make event connections available in QML. Change-Id: Ie45422481a794b1b350347c383318857e5dc3f6d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Improve QtScxml module conformity to other Qt modulesAlex Blasche2016-05-175-6/+11
| | | | | | | | | | The other QML modules use a versioning based on the Qt modules version. In addition the QML plugin name is always libdeclarative_<module_name>.so. Therefore the target for the QML project has to be adjusted accordingly. Change-Id: I218836bc01a7cb4ab8d8c3edde1d3d6deeaffd75 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Cleanup and rename QML scxmlstatemachine pluginAlex Blasche2016-05-123-8/+9
| | | | | | | | | The Qt modules use the Qt prefix and the project file should rely on qmake's qml_plugin logic. Change-Id: I9a13109d6307679c1e7362680eaf9c33e2bdda3b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add qmltypes file to QtScxml typesAlex Blasche2016-05-031-0/+21
| | | | | Change-Id: I91bba11ec274b1f1ca68aeab1514a5ef055ad5f6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Pass data model and initial values through the loaderUlf Hermann2016-03-302-0/+58
| | | | | | | | | As the loader automatically starts the state machine and we can only set the data model and initial values before the machine starts, we have to do this. Change-Id: I8d013465cc2f35ce286263bf881cb4389cb335b0 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Automatically initialize state machines when startingUlf Hermann2016-03-301-1/+0
| | | | | | | | | | This removes the need to call init() before start(), making the API much more intuitive. We also expose the initial values as a Q_PROPERTY so that they can be set in a declarative way from QML. Change-Id: If3c995c956764018bcab7b6caa8485e32bba6f1a Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Move the registration of QScxmlEvent type into QScxmlStateMachinePlugin.Friedemann Kleint2016-02-241-0/+8
| | | | | | | | | The metatype id was assigned to a global static variable, which caused a crash. Task-number: QTBUG-51144 Change-Id: I33ba3f3260310c2b5eda66beb5aca73974b6fc1f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Improve handling of various error casesUlf Hermann2016-02-161-1/+1
| | | | | | | | If the scxml document didn't have a root element, the application would crash when trying to parse it. Change-Id: Ib2cef3d81aa545e49f28d8587871af31bb0aef74 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Make sure the parser's input buffer is opened in release buildsUlf Hermann2016-02-161-1/+5
| | | | | | | | | | In release builds Q_ASSERT(...) is a nop. Thus, the opening has to happen outside a Q_ASSERT. Also, this is not really a fatal condition. We can just post a QML error in this case, the way we do it with other errors. Change-Id: I5009ae9b91d3fee6f66a22ff6e4a6a40203e3097 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Update license headersJarek Kobus2016-01-263-27/+81
| | | | | Change-Id: If100cc6cfeccc9ec4f13e03d69edfb7fad6bc2f6 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Even more documentation.Erik Verbruggen2015-12-011-2/+2
| | | | | Change-Id: Iac3a36a61b883ef9fa80a9b37fdc53a73f2b0e27 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Fix licenses.Erik Verbruggen2015-11-173-51/+60
| | | | | Change-Id: I7a520a55c92114dbb4d0a553bb9e0ebf610b095e Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Doc: standardized spelling of state machineNico Vertriest2015-11-131-2/+2
| | | | | | | state-machine --> state machine Change-Id: Ia32d1acb6cbc5584c468a2b0d7b732bc871b8272 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Get documentation generation working.Erik Verbruggen2015-10-281-0/+29
| | | | | Change-Id: I71356ec70d79fec51670fa9ee53541f263e12206 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Fix build.Erik Verbruggen2015-09-212-2/+2
| | | | | Change-Id: I7888d9520b3b54feb2ef1a16f52c247b48485d49 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Nuked the Scxml namespace.Erik Verbruggen2015-09-173-14/+14
| | | | | | | We're now just like Qt. Change-Id: I34a20b19436e0a8626436e9727cadb865f124517 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Renamed StateMachine to QScxmlStateMachine.Erik Verbruggen2015-09-172-5/+5
| | | | | Change-Id: I73c6ff52478383c3c3870e0a889194444c956a4b Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Renamed TableData to QScxmlTableData and ScxmlError to QScxmlError.Erik Verbruggen2015-09-171-1/+1
| | | | | Change-Id: I47fce45d787402f615ae200ef60f9226e367e448 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Pimple Scxml::ScxmlEvent, and rename to QScxmlEventAndré Pönitz2015-08-251-2/+0
| | | | | Change-Id: Ia352c421ae2190d0797ba7b67732a13c6251407e Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Pass data in & out of a state-machine.Erik Verbruggen2015-08-259-520/+113
| | | | | | | | | | | | | | | | | | For both C++ and QML, both for dynamically instantiated state machines and for state machines that are compiled to C++: - all states are exposed by name as properties - all signals of type "qt:signal" are signals - all events on which transitions react are slots Both signals and slots take a QVariant as parameter, which holds the _event.data property contents/params. The mediaplayer examples use the signals and slots to pass data out of, respectively into the state machine. Change-Id: Id4198450c2cc4b3ebdea25c6da729751bbdd194c Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Fix crash when setting an invalid URL as scxml filename.Erik Verbruggen2015-08-121-0/+3
| | | | | Change-Id: I8b65170e6cc1070b48e84726af888510a593c005 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Canonicalize module naming (QScxml -> QtScxml)Louai Al-Khanji2015-08-124-7/+7
| | | | | Change-Id: Iad3f027cddcd3c56bca9a136099ef0628f71f5ba Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Fix qmake warnings.Erik Verbruggen2015-08-113-15/+15
| | | | | Change-Id: If1ac9e716a0500027d1667db8e52385122e5c088 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Renamed StateTable to StateMachine.Erik Verbruggen2015-08-114-13/+13
| | | | | Change-Id: I4334a2a1c5a9ade7fb82882889d092eec615e50f Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 13:09:20 +0000