summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.1' into 5.11v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-211-0/+26
|\ | | | | | | Change-Id: Ic35c85419fae89c48b52e2383c2cd78a3bffa728
| * Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | Change-Id: I5f7ce3140d3ec12a943ba521aada313c534b5c65 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-180-0/+0
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1d5aeef667b2207ef0d0eb09f8ae17f6eadd77f9
| * | Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: Iebaa39dad6808f861ec6eeddde47a3658dee6c37
* | | Merge remote-tracking branch 'origin/5.10' into devv5.11.0-alpha1Liang Qi2018-02-017-2/+79
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/scxml/qscxmlcompiler.cpp Change-Id: Ie338e2c6a09e2d885d5f57a80abd386065ac8bc8
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3ff3d0eb30ee1d132410d412d04822bf52876e9d
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I5afded3d2affc0f69c4006b84421b98d88dff39a
| | | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| | |/ | | | | | | | | | | | | Change-Id: Ic4c3c33714361e4a60f11e9ab3a3333139baffba Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I49589e8e10a81820dac85d49b41177e0b2e20b8b
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I0fff420103cc8619302b2087a470f65c1afcb20f
| * | | qtlite: Skip building examples when configured with no-feature-itemviewsRainer Keller2018-01-123-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53141 Change-Id: I22a1d247e8debe5b1b700cc810de2f3b4ab7ce23 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie48c2c96ef24bc3db9cc0328477570343959c045
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+51
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I0009d9ab034091fdf4dc20d55fcffd1fb5d85fac
| | * | | Add changes file for Qt 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Alex Blasche2017-11-221-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00248fca4c3d2db1033ca1b609b0d35a3a824dc9 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-0/+24
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: I21f0dc5e52cff29605e374691e28123db2e202a6
| | | * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-101-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9fa46ad06a1c8595744342d99b586cf80cd84d94 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | | 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>
* | | | Make the network dependency explicit in the exampleKarsten Heimrich2018-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c12d9a1eacaf71ea3b061ac1b1cdd3bf4500157 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-206-16/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/scxml/qscxmlcompiler.cpp Change-Id: I4abda984e523cdf2a0810ed7dc1773e055746e18
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-152-3/+11
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Id4d40ec35ed8f13c7704d737312205f334139129
| | * | Output a better warning when runtime-loading malformed SCXMLUlf Hermann2017-11-102-3/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | 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-304-14/+52
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idcb35d4015f20d785263f00fe42d4839c7c4ad48
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: I39f588606a7a443de9712a88f3026f7ab25b780c
| | * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-281-0/+22
| | | | | | | | | | | | | | | Change-Id: I6e224fb7c9c6eced9d406e9e755cc50808f958ce Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| | * QML code improvements for examplesMichael Winkelmann2017-09-112-13/+18
| | | | | | | | | | | | | | | Change-Id: I0f7bfc749e41071268d107d3250910de918a2d0a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * 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-2716-86/+86
| | | | | | | | | | | | | | | Change-Id: I6bee476e2f467b57ee8e4bba1e780cf79c7a460e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-228-43/+43
| | | | | | | | | | | | | | | Change-Id: I074b69d728dfb597f4eb68cf516a2591658303ba Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2114-117/+117
| | | | | | | | | | | | | | | Change-Id: I68e08fd214ad3dbf4de9c9e23b1725950925c1fb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ / | | | | | | Change-Id: I43d215fe18844922ba09181579cf373c8f418898
* | 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-177-10/+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-1718-24/+179
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I12855e70c1444b9170f7ab55740bb50448e3dfb0
| * Fix the crash when sending an event into not running seviceJarek Kobus2017-08-154-2/+68
| | | | | | | | | | | | Task-number: QTBUG-61484 Change-Id: I3cebb3378a73d16901b18ec9465bcacf2e5ad486 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * Fix emission of state changed signalsJarek Kobus2017-08-145-1/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Update examples to C++11Michael Winkelmann2017-07-1810-21/+20
| | | | | | | | | | Change-Id: If23693387da9e5c0a102041298f626a068b26f6d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Fix the layout of lights in simple trafficlight exampleJarek Kobus2017-07-051-0/+2
| | | | | | | | | | | | Task-number: QTBUG-61313 Change-Id: I15ed8c33a25f1fa06e7635168775249199b0cd52 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: Ibb465f12e5e53a294e157f5891bddd38ef771856
| * Add changes file for 5.9.1v5.9.1Alex Blasche2017-06-231-0/+27
| | | | | | | | | | Change-Id: I64bc2733e786c98b4e9230403847fe73a64457cf Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Remove unneeded member and dead codeJarek Kobus2017-08-142-6/+2
| | | | | | | | | | Change-Id: I62b214add022b4725a81297217616d8548db5c7e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Remove unused and unimplemented private methodJarek Kobus2017-08-141-1/+0
| | | | | | | | | | | | Change-Id: I45df09f4d6c3c473566774c0e671c538b37c1696 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-077-10/+45
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5fa1c321a36fb70023ac7d99879c34c5ceaf8bb3
| * Fix a crash when log tag doesn't contain the expr attributeJarek Kobus2017-06-011-9/+11
| | | | | | | | | | | | | | | | Don't try to evaluate to string NoEvaluator is for log. Task-number: QTBUG-59568 Change-Id: Id2faa7f8b94aa18e8611aafcaa9f27217f5a4a9c Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+25
| |\ | | | | | | | | | Change-Id: Icde69f20fe470b3b5a6c5bf66aa8ede96647c69d
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 07:11:54 +0000