summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.9.5v5.9.5Antti Kokko2018-03-231-0/+24
| | | | | Change-Id: Iafe324b15c4573d2e1a4bf50c22999165bbd00bb Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | Change-Id: Iebaa39dad6808f861ec6eeddde47a3658dee6c37
* 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
| * 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>
* | 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>
* 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>
* 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>
* 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
| * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0Jani Heikkinen2017-05-111-0/+25
| | | | | | | | | | | | | | | | 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>
* | Doc: Update screenshots of examples to show Windows 10 styleLeena Miettinen2017-05-243-0/+0
| | | | | | | | | | | | | | | | | | - Calculator - Mediaplayer - Sudoku Change-Id: I4eaa71d178f81f9d317de2f3626b7fb08e5776e1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Fix usage of old (internal) APIErik Verbruggen2017-05-231-1/+1
| | | | | | | | | | | | Task-number: QTBUG-60938 Change-Id: I1bb77280bd4890cd5d7c5a96115d4b83973f5445 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Bump versionOswald Buddenhagen2017-05-101-1/+1
|/ | | | Change-Id: I29454ed69949d5bf092b989f6ab6e5dd39f7d191
* 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>
* Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3Liang Qi2017-04-181-0/+1
|\ | | | | | | Change-Id: Id25692bc7d3915c4b9129e644e3bdd6cc35e6a68
| * Kill the timer when we no longer need it5.8Andy Shaw2017-03-081-0/+1
| | | | | | | | | | | | Change-Id: I126a3479fe494eca5a616a5754b86bff4cbc022a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Fix build without features.commandlineparserv5.9.0-beta2Tasuku Suzuki2017-04-031-1/+1
| | | | | | | | | | Change-Id: I47398d653d4d3a9655e8d4480ffe4f7c3472e67b Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Doc: Fix QML property types and method signaturesv5.9.0-beta1Leena Miettinen2017-03-234-9/+16
| | | | | | | | | | 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>
* | Doc: Add docs for the ScxmlStateMachine QML typeLeena Miettinen2017-03-211-0/+231
| | | | | | | | | | Change-Id: I34310fcad96a8c2a7f2e38512a6452e7f254d820 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Doc: Showcase the "StateMachine" QML typeUlf Hermann2017-03-161-1/+1
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-1025-70/+175
|\| | | | | | | 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>
| * Make the content/expr test compliantUlf Hermann2017-02-082-7/+16
| | | | | | | | | | | | | | | | | | 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>
| * Add a way to verify events received from a test caseUlf Hermann2017-02-081-0/+103
| | | | | | | | | | Change-Id: I1012cb5c1b38c23af32197c48459668dc64144b2 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * Reformat include statements in accordance with coding conventionsUlf Hermann2017-02-0818-57/+49
| | | | | | | | | | | | | | | | | | 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>
| * Fix incorrect include of QStringMilla Pohjanheimo2017-02-081-1/+1
| | | | | | | | | | | | | | | | In public header files including Qt headers should be #include <QtCore/qwhatever.h> Change-Id: I4fb76e04a2bb2ed99e81fa41be1c03f14a047e16 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * Make ftpclient example valid scxmlUlf Hermann2017-02-072-2/+3
| | | | | | | | | | | | | | | | | | | | 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>
| * Evaluate expr in <content> to variant, rather than stringUlf Hermann2017-02-071-1/+1
| | | | | | | | | | | | | | | | 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>
| * Fix example to use source instead of filenameAndy Shaw2017-01-311-1/+1
| | | | | | | | | | | | Change-Id: I8ef23c1e79dbec48522fcbe78700176a06b02678 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Doc: Mention that the state machine owns submitted eventsUlf Hermann2017-03-061-0/+1
| | | | | | | | | | Change-Id: I9e83c938ff6ebc3c630b2d28f6d3c00cc340b291 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Make QScxmlScxmlService::stateMachine a Q_PROPERTYUlf Hermann2017-02-245-13/+117
| | | | | | | | | | | | | | | | 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>
* | Register a metatype for QScxmlStateMachine *Ulf Hermann2017-02-241-1/+4
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-2535-394/+968
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I639eb3acef7004a20447bbb66fb44661bf8e952e
| * remove obsolete host build declarations from subdirs projectsOswald Buddenhagen2017-01-181-2/+0
| | | | | | | | | | | | | | follows up qtbase/4eb2feb2. Change-Id: I967126f8ae400f9cf8d49683920e71df960b1763 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-0431-374/+960
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/scxml/qscxmlinvokableservice.cpp tools/qscxmlc/scxmlcppdumper.cpp Change-Id: Iadbe84d8eae7ccdf8dd9a0109af236a3747976c8
| | * Initialize the scxml element's initial transitionv5.8.0-rc1v5.8.0Ulf Hermann2016-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 14:48:12 +0000