aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix syntax error when trying to declare read-only object propertiesSimon Hausmann2014-10-248-1030/+1092
| | | | | | | | | | | | | | | | | | | | The grammar did not allow for the declaration of readonly property QtObject foo: QtObject { ... } and it required a workaround through an alias: readonly property alias foo: _foo property QtObject _foo: QtObject { ... } This was merely a glitch in the grammar, I see no reason not to support this. The semantics are like a const pointer in C++, the property itself is read-only but the object pointed to has per-property defined read/write semantics. Task-number: QTBUG-41971 Change-Id: I99e2e7ed58731e387a38e46ec39922d280a21ceb Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix license headers in Qml grammar specificationSimon Hausmann2014-10-241-48/+42
| | | | | | | | | | The grammar file itself wasn't updated accordignly and the license headers that are embedded in the grammar that will be copied into the generated files were also oudated. Re-generating the parser would produce files with the wrong license headers. Change-Id: I1db83df8a9c4bddfb58901f41a4d40f6b1396507 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix crash in SpriteSequenceAlex Blasche2014-10-244-3/+153
| | | | | | | | | | When QML declares sprites and goalSprite in wrong order the goalsprite attempts to set it on null spriteEngine. This patch ensures that the order doesn't matter anymore. Task-number: QTBUG-40595 Change-Id: I57f1c8754b2e2af91e0c7f72d1d67fec3ad4ede5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Updated the code snippets for the toLocalexxx functionsVenu2014-10-241-3/+3
| | | | | | | | | | Using Date() as a regular function without the new operator returns a string and not a date object. Change-Id: I083bb62c0cb3041a053d43e3085c3d0d10423db6 Task-number: QTBUG-41712 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Android: Keyboard doesn't hide from done buttonSamuel Nevala2014-10-241-0/+7
| | | | | | | | | | QLineEdit closes input method on enter key press, TextInput should also do the same. Commit and hide input method on enter key. When Qt::ImhMultiLine input method hint set only commit. Task-number: QTBUG-37850 Change-Id: I5a06e3eb777d7f794dd1493b307f0b05a2caf281 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Stop waiting in QTcpServerConnection if waitForBytesWritten failsUlf Hermann2014-10-241-2/+7
| | | | | | | | | | | | There is no point in waiting any further for the remaining bytes to be written as it will never succeed. We might get luckier by creating a local event loop and repeatedly calling processEvents(), but as that is considerably worse style and because you shouldn't rely on the connection to send on exit anyway we don't do that. Task-number: QTBUG-42158, see also QTBUG-24451 Change-Id: I79ffd5f5a4a7c41ff8dc0c4f6f1ca7e091844c9d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix build with QT_NO_DEBUG_OUTPUT definedSamuel Gaist2014-10-241-5/+13
| | | | | | | | | | | | The use of the qDebug() macro to construct a QDebug object fails when QT_NO_DEBUG_OUTPUT is defined when building Qt. This patch aims to fix this. [ChangeLog][General][Build] Can now build with QT_NO_DEBUG_OUTPUT defined Change-Id: If807ee3439db2a98b4d146f75860a98f40c247ec Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* QmlEngine: Use separate mutex for network access managerKai Koehne2014-10-232-2/+3
| | | | | | | | | | | | | Creating the network access manager can involve blocking calls to DBus, which apparently can take quite long in pathological cases. Using the same mutex in this case like for instance registering objects can therefore result in a freezing UI. Mitigate this by introducing a separate mutex. Task-number: QTBUG-41183 Change-Id: I55bd8453d8e4bbc0bda1591eb3fd48b50ca921c1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix pixelgrid snapping of native text on retina displays.Gunnar Sletta2014-10-235-14/+26
| | | | | | | | | | | Change 63e6c9ada82dc8f16e705cef5f89292784b7ace4 introduced snapping to the pixel grid in the vertex shader for native text, but this code was broken on retina displays because it assumed integer only positions. Fix it by including the retina scale factor into the rounding. Task-number: QTBUG-38702 Change-Id: I84492b02d64f263c9fe030790e04cf79b0dc4e2f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Relayout rich text when width increasesEskil Abrahamsen Blomfeldt2014-10-232-1/+29
| | | | | | | | | | | | | | | | | | | In updateSize() we were trying to force relayouts for RichText when the width changes by always setting widthExceeded to true. But further down in the same function, we overwrote this with textWidth() < idealWidth(), which doesn't work, because both properties are the wrapped width of the document and should only differ if the text cannot be wrapped properly. The result was that when increasing the width of a Text element, we would hit the optimization and skip the relayout. [ChangeLog][Text] Fixed Text with the RichText format to correctly update wrapping when the width of the element grows. Change-Id: I5fd87052a5ba7e8ee2549be0cfac4adc8ddf8290 Task-number: QTBUG-33020 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Remove unnecessary doneCurrent in QQuickWidgetLaszlo Agocs2014-10-231-2/+0
| | | | | | | | | Excessive makeCurrent - doneCurrent pairs should be avoided. We already do this in QOpenGLWidget and the QPlatformBackingStore composition code. Remove the doneCurrent from QQuickWidget too. Change-Id: I6f998d381c33880c470f34d7c8462b6ed8cd8ae9 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Doc: Fixed an error in the QML snippetVenu2014-10-231-6/+6
| | | | | | | | | | | Also updated the C++ snippet to look like a gui app that shows the QML example, instead of a console app that just provides the context data to the QML example. Change-Id: I17aca9f03521cfcadba1a965a4924e87cbf14c62 Task-number: QTBUG-41699 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix assignment to QObject pointer propertiesSimon Hausmann2014-10-232-5/+32
| | | | | | | | | | | This commit ammends 59ed8c355b99df0b949003a438ab850274261aa0 to always query the Qt meta-type registry to retrieve the QMetaObject for a QObject pointer type. Change-Id: I70d876a5acfa23967fd1a57c96fcd5ac853eaf49 Task-number: QTBUG-39614 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* Screen attached property: expose devicePixelRatio propertyShawn Rutledge2014-10-235-1/+28
| | | | | | | Change-Id: I08b22766b3e389b7d27ca4c56729f550b0647a08 Reviewed-by: Jens Bache-Wiig <jensbw@gmail.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix non-compiling QtQml code snippetAlex Blasche2014-10-231-1/+1
| | | | | | | Task-number: QTBUG-42006 Change-Id: I3c59b0ba27518750cba667f414f58edaa136d250 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add high dpi support to QQuickFramebufferObjectLaszlo Agocs2014-10-221-0/+23
| | | | | | Change-Id: I58aa163bd17fae7190161641d94f51887d8f88a6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Reduce memory pressure on the JS stack during garbage collectionSimon Hausmann2014-10-221-6/+16
| | | | | | | | | | | | As the example in QTBUG-42051 demonstrates, QML may produce a lot of binding objects and each of them produce a QV4::Persistent. During the mark phase we may run out of JS stack space. One fix (for the future) is to reduce the number of QV4::Persistent objects, but in the meantime we can also reduce the pressure on the stack by draining it earlier. Task-number: QTBUG-42051 Change-Id: Iea73f8a869048ea0bf3f4a64dbd24b6fb8c68f6b Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* Fix line ending for test fileKai Koehne2014-10-221-10/+10
| | | | | | Task-number: QTBUG-40574 Change-Id: If1fcc4cb00c8e477b3afff92eb4a3099424fcfa6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add note to QQuickItem docs about directly setting properties in C++.Mitch Curtis2014-10-221-0/+13
| | | | | | | | | | | It's not obvious that calling setPosition() directly, for example, won't trigger animations defined in behaviors that react to that item's x and y properties changing, because a quick glance at the code shows that they have almost identical code paths and both emit geometryChanged(). Change-Id: Ic7f7019b1bbba24732569c0de777ee02d79c1d3b Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix a PIDLIST_ABSOLUTE leak in QQmlEngine on WindowsJocelyn Turcotte2014-10-221-1/+5
| | | | | | | | | | | | | | The documentation of SHParseDisplayName doesn't mention that you need to free the ppidl parameter, but the documentation of the ITEMIDLIST does mention that you need to ILFree any ITEMIDLIST passed as PIDLIST_ABSOLUTE. Reproduced the leak by repeatedly showing and closing the window on the task's example. Task-number: QTBUG-41588 Change-Id: I91d08728fc907c59e56ae344a2d12f0865031120 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix disfunctional QQuickRenderControl with multiple screensLaszlo Agocs2014-10-2210-13/+41
| | | | | | | | | | | | | | | | | | | | Having a retina and non-retina screen connected resulted in getting no output from QQuickRenderControl and QQuickWidget on the non-retina screen. This is caused by the fact that Quick is blindly calling QWindow::devicePixelRatio(). This approach is wrong when using QQuickRenderControl since the QQuickWindow does not have an actual native window and so devicePixelRatio() merely returns some default value which will definitely be wrong for one of the screens. The patch fixes the problem by introducing QQuickWindow::effectiveDevicePixelRatio(), which, via QQuickRenderControl::renderWindowFor, supports the redirected case too. Task-number: QTBUG-42114 Change-Id: I057e01f0a00758dde438fc9b10af3a435b06bb0b Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Add \since 5.4 to FontMetrics and TextMetrics.Mitch Curtis2014-10-222-0/+2
| | | | | Change-Id: I5fa93d559cdfde5e6b84ab0f3f35fd600e6bec4f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Support Accessible.ignored on non-leaf itemsJan Arve Saether2014-10-219-26/+185
| | | | | | | | | | Ignoring items with children will make the children appear as children of the parent of the ignored item. Since setAccessibleFlagAndListener now only sets the flag we also rename the function to just setAccessible Change-Id: I79fc311509a3e454b4698274c63ad0e879fb93e3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Check list property before component when validating bindingsUlf Hermann2014-10-214-2/+16
| | | | | | | | | There are lists that won't accept a component as element. For example QQuickItem's children will only accept QQuickItems. Task-number: QTBUG-41848 Change-Id: I0fc7b0d1a4770d596caf681be92dff216f48d32b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix a bug in implementation of Accessible.ignoredJan Arve Saether2014-10-212-2/+1
| | | | | | | | m_ignored is not really used. (cherry-picked from dev branch: 2c42d6af19f57ae013da0a4c45b6e1de8fb99e99) Change-Id: Ic2926fbdf22a6a5bc82fe9f4475b7b8058eacae5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* QQuickCustomParticle: Check for current OpenGL Context before useAndy Nichols2014-10-211-0/+3
| | | | | | | | | | | QQuickCustomParticle::buildCustomNodes() assumes there is a valid OpenGL context, but when there is not it will simply crash. Instead we check for a valid current OpenGL context first, and return 0 if it is not availalbe. This needed for the Qt Quick 2d Renderer. Change-Id: I6bfcfc8fa9581bfd27015f719fc527c36492eade Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* QQuickSpriteEngine do not use OpenGL without checking for GLContextAndy Nichols2014-10-211-0/+4
| | | | | | | | | | In the case that QQuickSpriteEngine::assembledImage() is called when there is no current OpenGL context, return a null QImage instead of crashing. This is needed for the Qt Quick 2d Renderer case. Change-Id: I75b9b1f31f05cc0800293435d660e498fecc4d20 Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Don't assume there is only one toplevel item.Jan Arve Saether2014-10-212-15/+18
| | | | | | | | With the upcoming introduction of unignoredChildren, there can exist many top level items (if the root item is ignored). Change-Id: If7aaea08fdd4d1f5a0a5109e1239c53e0af9b61e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Improve hit testing so that it works better with ignored itemsJan Arve Saether2014-10-215-85/+57
| | | | | | | | | | | | | | | | | | | | | | | | The hit testing won't work very well with the upcoming patch that changes which items that can be ignored. (basically it doesn't consider the isAccessible flag, so childAt_helper might return a node that was supposed to be ignored) Earlier this was a sensible optimization in order to avoid too many heap allocations and deallocations of interfaces, but these are cheap now, so we can do it the do it the 'proper way' (i.e. before this patch we didn't respect the a11y hierarchy as given by QAccessibleInterface child() and parent(). This also uses the QAccessibleInterface::rect() directly now instead of using the itemScreenRect() function, which was shared between QAccessibleQuickWindow and QAccessibleQuickItem. Since this changes the order of child interfaces to paint order (i.e. second child interface is on top of first child interface), we need to ensure that we hit test child interfaces in the correct order. They should now always be processed with the last interface first, and then return as soon as something is hit. Change-Id: Ie951fc3b48b7affd9f7e98687a1cbbe008857d2a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Fix failing makeCurrent in basic renderloop when closing windowsLaszlo Agocs2014-10-211-3/+19
| | | | | | | | | | | | | | | The makeCurrent() call can fail if there is no underlying platform window present anymore (due to close()). Just continuing with the cleanup is wrong: There may be another context current (from the application or from some other component of Qt) and there are GL calls issued which would mess up the state in that context. Therefore we ensure there's a context/surface by using a temporary QOffscreenSurface. Task-number: QTBUG-41942 Change-Id: I79f35a1f5bbe7a8a14943e8603764575ed119f93 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* qmlstatemachine: Rename StateBase to StateKevin Funk2014-10-2128-143/+174
| | | | | | | | | | | | As discussed with Brett Stottlmyer and Alan Alpert. Add a section about the implications when importing both QtQml.StateMachine and QtQuick in one single QML file. Change-Id: I8755f4b578e2a6ff4c2377c7a8a0b996ba9b7129 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Tweak new animation driver.Gunnar Sletta2014-10-201-18/+18
| | | | | | | | | | | | | | | We're removing the bad/reallyBad concept for the benefit of an accumulated lag. When the lag passes over a certain threshold, we switch to time based. The logic for switching back remains unchanged. We also fixed the switching so that elapsed() does not jump from the predicted time to the animation system's wall time, but rather continues from the predicted time with a walltime offset (this is how it was always intended to be). Task-number: QTBUG-42020 Change-Id: I7ee9181aca46cbc18a74fae5e8d513365906c017 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Make test more robust against ignored children.Jan Arve Saether2014-10-204-33/+84
| | | | | | | | With the upcoming change that changes the semantics of Accessible.ignored, some assumptions in the test does not hold anymore. Change-Id: I9b34f1ecc61fc0d4e8abe5a5505a5bcff44501d4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Fix tst_qquickpositioners on OS XFrederik Gladhorn2014-10-201-0/+3
| | | | | | Done-with: Jan Arve Sæther Change-Id: Iff66f62167a5977354319aac311d2cb81d9f3842 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Simon Hausmann2014-10-143-14/+29
|\
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-143-14/+29
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4objectiterator.cpp src/qml/jsruntime/qv4objectiterator_p.h src/quick/scenegraph/qsgthreadedrenderloop.cpp Change-Id: Ia54a9acd96530aa6683c228597af0ca25eadec4f
| | * Move syncTimer measurment to the correct place.5.3Josh Arenson2014-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | syncTimer was including the time spent waiting for VSYNC on unchanged frames. This was causing the reported value to be much higher than expected. Task-number: QTBUG-40556 Change-Id: Ife759b4e27faf2124ab330be8d1f42d15c4d2d33 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| | * Fix crash with foreach on arguments objectSimon Hausmann2014-09-112-14/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We call fullyCreate() on the arguments object when it's initialized on an foreach iterator. That itself however might trigger an allocation, which in turn might collect the ForEachIteratorObject, which is missing a "ProtectThis" in its constructor. Change-Id: Ib8f7e39201e727cde91cbbe8a82cba78aa980f0d Task-number: QTBUG-40844 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | examples/quick/positioners: Colors changed and layout obeys screen resolutionKari Hautamäki2014-10-143-164/+210
|/ / | | | | | | | | Change-Id: I61b6358d6d5dff4cc9a14f8774b1c3597e83b550 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Correct KeyEvent::key documentation.Mitch Curtis2014-10-131-2/+1
| | | | | | | | | | | | | | "text" is a property, not a function. Change-Id: I02158d550ff174076396810dca007df1d734bda5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Improve performance of animators.v5.4.0-beta1Gunnar Sletta2014-10-105-18/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of one QCoreApp::postEvent() per completed animation added up to a very large overhead when 1000+ animators were used at the same time. This is very relevant for sprite games and similar and deserves to work at least as good as normal animations. Instead, store the animations to stop and stop then on the gui thread later as a result of frameSwapped. For the benchmark in question this allows for roughly double the amount of animators being started and stopped. Change-Id: Iae3d1ec1502ee1908fdbba708fa9f976aa230064 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | Fix issues with Keyboard Focus documentation.Mitch Curtis2014-10-101-3/+3
| | | | | | | | | | Change-Id: I0dcc364456404a761a555da065452a59d1249a2f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Stabilize and fix comparisons in animator tests.Gunnar Sletta2014-10-1011-64/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | compare() will compare properties of objects and neither Qt.rgba nor image.pixel created objects has enumeratable properties so compare is pretty much useless. Use verify + == which will rely on toString() which is ok. A few of the tests relied on execution order of signals emitted on animation.running being changed and would occasionally fail. Change-Id: I531c7f21b58a922a6be9ca2b6de120a68209a6d6 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | PathView: Fix QML engine thinking currentItem is null when it's notSérgio Martins2014-10-103-0/+47
| | | | | | | | | | | | | | | | QML didn't re-evaluate any bindings using currentItem because a notification was missing. Change-Id: Icdaa3022e0b01644a060e577d87f011b4ea9fabb Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Fix QQmlExpression/QQmlScriptString/QQmlBinding crashesSimon Hausmann2014-10-0925-87/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the QQmlScriptString we store the binding id and it is an index into the runtimeFunctions array of the compilation unit. However we don't store the compilation unit and instead in QQmlBinding and QQmlExpression try to retrieve it from the cache via the context url (we have the context after all). That turns out to be not a reliable way, as sometimes the URL might slightly differ from the originally compiled cache (qrc:/// turning to qrc:/ maybe). Consequently the type is (unnecessarily) compiled again and unfortunately not _linked_, therefore the runtime functions array is empty. Another option is that when the component was created from a QByteArray, then no entry exists in the cache in the first place. This patch addresses the problem by storing a reference to the compilation unit in the QQmlContextData. That we can safely retrieve and it'll make sure the compilation unit also stays alive. In the process of that the manual reference counting was switched over to QQmlRefCount and QQmlRefPointer for QV4::CompilationUnit. Task-number: QTBUG-41193 Change-Id: I9111f9a3b65618e453954abcd789c039e65a94f7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Return the content position rounded on the right sideGiulio Camuffo2014-10-091-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickFlickable::contentX/Y() returns the negative of the value stored in the QQuickTimeLineValue used by QQuickFlickable. So we must be careful when using things like qRound, and call it with the negative of the value ine the QQuickTimeLineValue, else code like this would fail: QQuickFlickable *f = ... f->setPixelAligned(true) f->setContentY(-10.5) assert(f->contentY() == qRound(-10.5)) // fail The assert expression indeed turns into -11 == -10, which is false but which is not what the user would expect. Change-Id: Ib92ee2fa613b751462237349d9e4e2f2b4652f82 Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | Export QQuickKeyNavigationAttached as a part of the private APIOleg Shparber2014-10-091-1/+1
| | | | | | | | | | | | | | | | This change fixes linking problems when QQuickKeyNavigationAttached is used through private headers. Change-Id: I176a9551718d9ba25c160a3b1caa8872c88d39f3 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Make QQuickKeyNavigationAttached respect user set valuesOleg Shparber2014-10-091-6/+6
| | | | | | | | | | | | | | | | | | | | Before this change, when user tried to set KeyNavigation property to the value which was previously automatically assigned, user set flag wasn't raised. Such behavior led to situations, when explicitly set values later were not respected by automatic mutual changes. Change-Id: Id5ba5061c03a61f4d7835a638dc746b1485b9a56 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Doc: Updated the QML State Machine docsVenu2014-10-097-125/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Excluded the src/imports/statemachine directory from qtquick.qdocconf to avoid unnecessary qdoc warnings. - corrected a broken link to an external source - changed the group name to avoid collision - added a \qmlmodule page for QtQml.StateMachine - Reduced the amount of duplication between the C++ and QML state machine overviews. Task-number: QTBUG-41561 Change-Id: I87c815fada7006f0609331e315bb338f062bb4db Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: Updated the \brief and detailed descriptionVenu2014-10-091-2/+3
| | | | | | | | | | | | | | | | | | | | Just to give a hint to the reader about what the example does. Task-number: QTBUG-37203 Change-Id: Ibb377e4adfb25ed4e4da0a41280e4157fae638ba Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 02:22:42 +0000