summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|\ | | | | | | Change-Id: Ib0e7bdb66fc3e8d0cf5eeca900e93703c76f1cae
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Iddf20afd4fe0289079afc91fe43c14fd7ebbb5ab Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-031-2/+2
|\| | | | | | | Change-Id: I26b42db1fde32e787929f7c2bd95791d791d41ee
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-021-2/+2
| |\ | | | | | | | | | Change-Id: I0d9f4c33a54c19d3f7707ae515eea90779219491
| | * Fix warnings about fall throughFriedemann Kleint2019-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use Q_FALLTHROUGH, fixing: ../../src/scxml/qscxmlcompiler.cpp:1591:9: warning: this statement may fall through [-Wimplicit-fallthrough=] ../../src/scxml/qscxmlcompiler.cpp:1610:9: warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: I39fb346f1c5fa3e328ee82aa14675557034439c9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Optimize connectToState() methodJarek Kobus2019-05-292-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Introduce a cache of state name to signal index and use it in connectToStateImpl. Change-Id: I75af2b77b12d6e087163612f3ba10590a14fd9e2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Fix deprecation warning about QVector<T>::fromStdVector()Friedemann Kleint2019-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning: scxmlstatemachineinfo.cpp:246:30: warning: 'static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]' is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] amending c17eb247ddf22280f19975eec4d3a13335d43ba7. Change-Id: I340f1969a62f25dba1b8cd67f62c7403d48b5383 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Fix deprecation warnings about QVector<T>::fromStdVector()Friedemann Kleint2019-05-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: qscxmlstatemachine.cpp:1098:59: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1098:91: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1129:64: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1130:46: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1193:59: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1193:85: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachineinfo.cpp:246:30: warning: 'static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]' is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachineinfo.cpp:246:92: warning: 'static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]' is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] Change-Id: Ib7469b6b0f92de06779419629ba8170c6d96c04c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-021-2/+2
|\| | | | | | | | | | | Change-Id: I98f5c2716b6bfd21b6719867862caa2d0f186d2e
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-301-2/+2
| |\| | | | | | | | | | Change-Id: I01a6583514a3483ea2706dfd9d70a3c15999969e
| | * Fix module dependencies of scxmlKai Koehne2019-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 67d9d69b97 made qml a conditional dependency of a qtscxml module. Anyhow, because qt_module.prf was included before the qml dependency was added, the generated qt_libs_scxml.pri file didn't track this dependency. This lead to issues when examples were built against a Qt where libQt5Scxml was not yet installed, and therefore libQt5Qml and libQt5Network wasn't found. Fixes: QTBUG-75383 Change-Id: Ieba5972a1509400aa145fc29b11fbba4c1d625fd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-135-19/+25
|\| | | | | | | | | | | Change-Id: I76b32ad6f263b4a45c0f7c9b40a121528dd3bc14
| * | 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-125-7/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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>
* / Remove unneeded includeJarek Kobus2019-02-081-1/+0
|/ | | | | Change-Id: Ie433972087b6b35e3f8e740263fad19b35ab0f54 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Don't suppress <log> tags with missing or bad exprUlf Hermann2018-11-141-10/+12
| | | | | | | | | Rather, output an empty string as message in this case. Ignoring log instructions is highly confusing. Change-Id: Iebb30ffd3ade33f1277f3073f015127a99170e40 Task-number: QTBUG-71746 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Remove compatibility code for private QML APISimon Hausmann2018-07-181-13/+0
| | | | | | | | The old code is not needed anymore now that qt5.git is up-to-date. Change-Id: I4d7a76e338205d0e3b685bc3bba56aa609bbdeeb Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Adjust to internal API changes in qtdeclarativeLars Knoll2018-07-121-0/+12
| | | | | | Task-number: QTBUG-69367 Change-Id: I2e01feebb0166b8279cf28e4cab39d8caaed1d59 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove private API guardsSimon Hausmann2018-06-291-4/+0
| | | | | | | | After commit 26dd89e493e0957a4086798970b017afe0e932d5 in qt5.git we can remove the guards as the old API is not available anymore. Change-Id: I437f14eec4df74775efb66dc004344e4af068e1a Reviewed-by: Liang Qi <liang.qi@qt.io>
* Adapt to internal QtQml API changesSimon Hausmann2018-06-281-0/+4
| | | | | | | | | After commit 3e1bb90da4c44455c8c307e01876cc2127bdb15c, query is now called getOwnProperty. Task-number: QTBUG-69180 Change-Id: Ie24b17c1d710cead9cbe4feece7a28d7fa926a0e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Make the ECMAScript model a configurable featureSimon Hausmann2018-06-287-6/+48
| | | | | | | | Introducing this feature allows our users to slim down the module. Task-number: QTBUG-61960 Change-Id: I94215fd3c6dee9766a5f7479bec0440cdfe85ac1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-1/+1
|\ | | | | | | Change-Id: I10832de7d3c67ed67ec4b183023ed4ca65729e36
| * Doc: Add missing dot (qtscxml)Paul Wicking2018-06-191-1/+1
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I476e01b2f141abe019694cb7418be07b5646dc02 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Fix link error on WindowsFriedemann Kleint2018-05-162-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | QScxmlDataModel::ForeachLoopBody::~ForeachLoopBody() needs to be exported for it to be used. Export the class, disable copying and add a constructor, fixing the Clang warning: warning: definition of implicit copy assignment operator for 'ForeachLoopBody' is deprecated because it has a user-declared destructor Task-number: PYSIDE-487 Change-Id: I3f896d9e75a8da072a63cdab9924c58b0c36d482 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Fix tst_scion failuresSimon Hausmann2018-05-031-1/+1
| | | | | | | | | | | | | | | | | | After commit 8780764b274217b256aadd00114a76bdffbdb1ef in qtdeclarative, calling evaluate("function() { ... }") produces a warning and it will throw a syntax error in the future. Change-Id: Iedf1a634abd8284b9ced932a3855924bed574987 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix coding style issuesJarek Kobus2018-05-021-2/+2
| | | | | | | | | | Change-Id: Ica7d960babffbf2ef1e6e43c032c236de4a3472e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix coding style issuesJarek Kobus2018-05-022-3/+3
| | | | | | | | | | Change-Id: Iaac75c72d5ddb61ebf443acdffad9a14c83aeaf3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Use nullptr instead of 0Jarek Kobus2018-05-024-5/+5
| | | | | | | | | | 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>
* Fix Qt5ScxmlMacros.cmake for CMake 3.9v5.11.0-beta4v5.11.0-beta3Rolf Eike Beer2018-03-231-0/+1
| | | | | | | | | | | | | CMake gained support for running AUTOMOC on generated headers, so we need to mark them with SKIP_AUTOMOC since we're generating moc files for those already. Otherwise we get duplicated symbols. The same change has already been done for generated DBus files, but it is needed here, too. Change-Id: I48a998bc1769478d34d8f30f0e849cd91bc1f785 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: David Faure <david.faure@kdab.com>
* Doc: Exclude a private header to suppress QDoc warningsLeena Miettinen2018-03-231-0/+2
| | | | | Change-Id: Ib157544d54e73e9afeca0dc01c3509be3773e1a0 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Align methods and docs for QScxmlStateMachineUlf Hermann2018-03-222-103/+63
| | | | | | | | | | | | qdoc can nowadays parse the complex method declarations in qscxmlstatemachine.h, so we don't need to ifdef them out anymore. Also, recognize that the context parameters to the connect methods can all be const, as documented, and rename some parameters to match the documentation. Change-Id: Iad200f9d4719d5c34e74ad0cc002338322662e8f Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Remove Q_QDOC ifdefs from qscxmlexecutablecontent_p.hUlf Hermann2018-03-221-2/+0
| | | | | | | | qdoc shouldn't try to generate docs for methods in private headers. Why does it try for those? Change-Id: Ib9bb78c9bbdd854ffa48601c6a29dc30718f4155 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Doc: Document anonymous enums in QScxmlExecutableContentLeena Miettinen2018-03-221-1/+17
| | | | | | | | To fix QDoc warnings. Change-Id: I117471c55caab3030212aea763b5a9c19f492a0c Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Doc: Fix documentation warningsTopi Reinio2018-03-202-16/+23
| | | | | | | | | | | | QDoc in Qt 5.11 uses Clang to parse C++ documentation, and it's capable of resolving templated function signatures; adjust the \fn commands accordingly. Also, fix one Q_PROPERTY declaration that caused Clang to misintepret '*>' as an operator. Change-Id: I87a06dd479caad99955d7e8ee566e9eba36f517b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devv5.11.0-alpha1Liang Qi2018-02-011-2/+0
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/scxml/qscxmlcompiler.cpp Change-Id: Ie338e2c6a09e2d885d5f57a80abd386065ac8bc8
| * Remove unnecessary Q_OBJECT_CHECK macroThiago Macieira2017-11-221-2/+0
| | | | | | | | | | | | | | It isn't used by qobject_cast anymore since Qt 5.2. Change-Id: I15b62e0f9cec482fbb40fffd1490dbadff4c5e2a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-202-3/+19
|\| | | | | | | | | | | | | Conflicts: src/scxml/qscxmlcompiler.cpp Change-Id: I4abda984e523cdf2a0810ed7dc1773e055746e18
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-151-3/+8
| |\ | | | | | | | | | Change-Id: Id4d40ec35ed8f13c7704d737312205f334139129
| | * Output a better warning when runtime-loading malformed SCXMLUlf Hermann2017-11-101-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | The document might technically have a root element. We might not be able to read it, though. Also, output all errors without quotes. Change-Id: I8133e322e452ea0c3d079b5cbe23aed2f2952b3e Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-301-1/+12
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idcb35d4015f20d785263f00fe42d4839c7c4ad48
| | * 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-2713-71/+71
| | | | | | | | | | | | | | | Change-Id: I6bee476e2f467b57ee8e4bba1e780cf79c7a460e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-227-42/+42
| | | | | | | | | | | | | | | Change-Id: I074b69d728dfb597f4eb68cf516a2591658303ba Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2111-110/+110
|/ / | | | | | | | | Change-Id: I68e08fd214ad3dbf4de9c9e23b1725950925c1fb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Cleanup JS includes, remove unneeded codev5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Jarek Kobus2017-08-184-11/+4
| | | | | | | | | | Change-Id: Ic24fed82ecd57cfee91372915b61e43c2a2dca22 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Pre-declare some meta types in the headersUlf Hermann2017-08-173-2/+9
| | | | | | | | | | | | | | | | | | It doesn't make much sense to declare the meta type for QScxmlError in all the tests. Also, types exposed through Q_PROPERTY should be declared. Change-Id: Ibb08440e1f40845ea779e1c2a3882bc1b1e0a935 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-173-4/+32
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I12855e70c1444b9170f7ab55740bb50448e3dfb0
| * Fix the crash when sending an event into not running seviceJarek Kobus2017-08-151-1/+1
| | | | | | | | | | | | Task-number: QTBUG-61484 Change-Id: I3cebb3378a73d16901b18ec9465bcacf2e5ad486 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * Fix emission of state changed signalsJarek Kobus2017-08-142-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The state index is not the same as its changed signal index. The changed signal is not being generated for history states. The current fix is that we create a hash cache of state index into the signal index of its appropriate signal just after we set the table data for the state machine. Task-number: QTBUG-61243 Change-Id: I778adaf6c2d626be17c50b558f93ec0035ea3325 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 08:15:05 +0000