| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Listing important changes and bug-fixes.
Change-Id: Ic1f2594bf15932dc8b687f1071cbded32c4c2e45
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: Id25692bc7d3915c4b9129e644e3bdd6cc35e6a68
|
| |
| |
| |
| |
| |
| | |
Change-Id: I126a3479fe494eca5a616a5754b86bff4cbc022a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I47398d653d4d3a9655e8d4480ffe4f7c3472e67b
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I2b7897015a743cf70847270117ada881559ce7c9
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I87279e065b7ea3ca7bcd9100bc2d36a5e5b677c9
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I0b4c93797fa076e6360c92badea551b01acef644
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
The convention is not to document them.
Change-Id: I9d133e05a4d2b15b47bfb3ce06b07c661534a17c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I34310fcad96a8c2a7f2e38512a6452e7f254d820
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
You don't need to use QtObject to store a state machine in QML as we
conveniently register a type for you.
Change-Id: I21c774e6d11ad0576f8ec76f3303368fe355b4b5
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I467bf942ab818d350a1c08c8567566b9bbfcb5a5
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We cannot add both an 'event' attribute and a <content> element to
<send>, and we cannot match anonymous events in transitions. We can
receive them in the C++ code, though.
Change-Id: Ieef7aba3fee79181c56002a0334f9f8e4af4df14
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I1012cb5c1b38c23af32197c48459668dc64144b2
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
In public header files including Qt headers should be
#include <QtCore/qwhatever.h>
Change-Id: I4fb76e04a2bb2ed99e81fa41be1c03f14a047e16
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Section 6.2.3 of the standard says "A conformant SCXML document MUST
specify exactly one of 'event', 'eventexpr' and <content>." Therefore
we cannot use <content> with 'eventexpr', but we can use <param>
instead.
Change-Id: I64c0ec8a1f08d5b441e5b52a83800800f8a99d03
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
There is no reason to artificially clamp the range of possible data
types as the data() member of QScxmlEvent is QVariant.
Change-Id: I9264a61566c60bbf1325f3864064a093dc02edbd
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I8ef23c1e79dbec48522fcbe78700176a06b02678
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I9e83c938ff6ebc3c630b2d28f6d3c00cc340b291
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Without this, the invoke example doesn't work.
Change-Id: I8c4ae9b21e1164946f2a60777b9e9905f2b51237
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We want to be able to pass it through QVariant without manually
registering it.
Change-Id: I99a39a168f4b4620b91f184f13ad744172d89d1e
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I639eb3acef7004a20447bbb66fb44661bf8e952e
|
| |
| |
| |
| |
| |
| |
| | |
follows up qtbase/4eb2feb2.
Change-Id: I967126f8ae400f9cf8d49683920e71df960b1763
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/scxml/qscxmlinvokableservice.cpp
tools/qscxmlc/scxmlcppdumper.cpp
Change-Id: Iadbe84d8eae7ccdf8dd9a0109af236a3747976c8
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This prevents TableDataBuilder::visit() from asserting when an empty
state chart is processed.
Task-number: QTBUG-57499
Change-Id: If5ca4f68101ff72548d43e4c84c02c84b9803017
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The QScxmlStateMachine::runningChanged signal was never emitted. Emit it
when the running property changes.
Change-Id: I9b6cb8d48c9c8d893b0af2b8f87ecd74f4e64055
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix an external link and add \brief commands for properties.
Change-Id: I84477f0cfddb27bbb4d807f8f1b000601af245c9
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Most of the methods marked as \internal or excluded via
"#ifndef Q_QDOC" so far are not actually internal as they are called
from compiled state machines. We have to document them.
Change-Id: Ib80268ae00f536e9ac2d337b565dcafbbdc31dea
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As we need to access it from everywhere, we can as well make it a
public property of the state machine. This saves us the tableData()
method on QScxmlDataModel and some back and forth between d and q
pointers. We can also drop the indirection for accessing the state
machine in most cases, as that is just a public member of
QScxmlDataModelPrivate.
Change-Id: I4aa0cec7d4664aec7b1581de531cdb1554ca5342
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There is no reason to prohibit the implementation of <assign>,
<foreach> and initialization. That will just make people resort to
the base class instead of using the facilities offered by the C++
data model.
Change-Id: Ic2c8d679a2c8f1c592cb3075c0b70c7cff80cd9c
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It's not illegal to do e.g. <assign> in your SCXML document without
implementing the assign operation in your data model. The assignment
will fail, setting the ok parameter to false. That should be enough.
Q_UNREACHABLE() is unreliable anyway as it only triggers in debug
builds.
Change-Id: Ib29a20682d2c9256fcf59d29e32383c1df675eba
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I6d7f4ef2215e8fe0b0547b71130a684139d55c0b
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
They should reflect the file name.
Change-Id: I4f1ba1b98b673cfcb9ccacc8d83a42e06b1f2a3d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I8fa59d8b2559aa620eb533ed4274ea1b7374d2c7
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We don't need to expose explicit destructors when inheriting from
QObject.
Change-Id: I2c9e7b075cab9b8b44be10045aeddd3c1cfb89b7
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We inline QScxmlInvokableService::finalize into the only place where it
is used.
Furthermore we construct static SCXML state machines through their
metaobjects rather than directly calling the constructor. This way we
can drop the template, make all the service factories QObjects, drop
the intermediate QScxmlScxmlServiceFactory class, and greatly reduce
the API exposed in qscxmlinvokableservice.h.
In addition, as some of the structs in QScxmlExecutableContent are
fairly large, we return them as const references, rather than by value.
Change-Id: Ia9ee61b5668b8af44307787339c08f3c6f23f713
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
... instead of the various properties of the factory. This makes the
API nicer.
Change-Id: I16f3c6382d6cc71500147f8d2dbd35392924b5f0
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If those get called, it's definitely an error.
Change-Id: I0515e02ff77c2839bc4d31d35d266ecdfecb7624
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is an inconsistency in the public API. The bool return value is
unnecessary as we pass a bool *ok, just like we do for the other
evaluation methods.
Change-Id: I750e5d6d39df417fec727ef6f3ec1ade5ddc2dfc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ie002703be7e93308999fcdb793be45670beb7cbc
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We don't have anything to display since our background image isn't
scalable, so just prevent resizing past the implicit size of the
background image to avoid a black region being visible.
Task-number: QTBUG-57476
Change-Id: I57e55f860b3447c6940c90b04b8b4e1b0f87d484
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the CI obtains them from the qt5 super repo nowadays.
Change-Id: I7bb10a858bb3f920139fb7cd9ac2134885e4878d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We should not compare instances of different IDs with one another.
Change-Id: I830d747ffde4c162c73475a600cef23e10c898e5
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We can easily do this and provide a much nicer API. These methods are
not available for dynamically loaded state machines. By default we
provide the same API for compiled and loaded state machines. The new
methods are only generated if you pass the "--statemethods" parameter
to qscxmlc. A new qmake variable called "QSCXMLC_ARGUMENTS" is added
for any extra arguments to qscxmlc such as this one.
Change-Id: Ie7a4eb4890c9d42f89093f3cf3ea917ef2793518
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
|
|\| | |
| | | |
| | | |
| | | | |
Change-Id: I327045f701339ce2bf54b47a3a5ea9b08cdcc5f8
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
Fix syncqt warning:
QtScxml: WARNING: qtscxml/src/scxml/qscxmlinvokableservice.h includes qscxmldatamodel.h when it should include QtScxml/qscxmldatamodel.h
Change-Id: I5fb1f942aafc56a0fc96c00931e59c09b90df25f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
examples/scxml/trafficlight-common/TrafficLight.qml
tools/qscxmlc/doc/qscxmlc.qdoc
tools/qscxmlc/scxmlcppdumper.cpp
Change-Id: I1452fa6a24486fb33f70b49eff593a925894f8da
|