aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix multi-length string substitution.Andrew den Exter2012-02-165-7/+123
| | | | | | | | | | Multi-length string eliding was provided by QFontMetrics::elidedText() which is no longer used for layouts. So we instead have to do the string substitution ourselves if the text doesn't fit before finally eliding. Change-Id: Iab2e54b332390290d656299a5be148f39f78df9d Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Allow binding the size of a Loader to its item.Martin Jones2012-02-163-1/+55
| | | | | | | | | | | If the size of the Loader is bound to the item, the item was resized before the binding was evaluated, resulting in an item height of 0. This change allows bindings to the item to be evaluated before we apply the resize logic. Task-number: QTBUG-22628 Change-Id: I30acdb54214b422a9d4aa4e7e02a0af3674322db Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add basic plugin metadata for QtQuick2 import plugin.Michael Brasser2012-02-162-7/+3
| | | | | | | | | | This indirectly fixes the qdebugmessageservice autotest, which was getting confused by the "old plugin" warning. Also updated the extension plugin interface to use org.qt-project rather than com.trolltech. Change-Id: I94fc6cf03d23e606c2e2333b013dd2b698f04623 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* QmlProfiler: sending start profiling messageChristiaan Janssen2012-02-152-1/+17
| | | | | | | | | Will be used by the client to show status in the GUI. When profiling is stopped, data is sent immediately, therefore no "stop profiling" message. Change-Id: Idd12069a9707296b87e305e8b3cbf8e324989a3f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Introduced QQuickCanvas::releaseResources().Gunnar Sletta2012-02-157-28/+146
| | | | | | | | This function can be used in certain situations to purge the texture cache and triggers more lazily to take down the scene graph and GL context Change-Id: Icd9360ff50fda0e721ba0f1b520cda678e457a35 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix warnings in sequence wrapper codeChris Adams2012-02-155-37/+219
| | | | | | | | | | | | | | | Previously, the sequence wrapper had unsigned int / signed int comparisons (due to Qt container classes only allowing signed int indexes (where negative indexes are invalid). This commit ensures that unsigned indexes are bounds checked appropriately, and also fixes a warning due to QString construction from QByteArray. Finally, it updates the documentation for sequences to clarify the indexing semantics. Change-Id: I4c6e133bef6e980a9ccb62ff15a70a5d41537ee3 Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Improve test coverage for QQuickItem.Michael Brasser2012-02-154-0/+95
| | | | | Change-Id: I1a49fd44ba85e0fa87a76c07e39cb603cd4f12e7 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Remove etcprovider plugin.Michael Brasser2012-02-157-472/+1
| | | | | | | | | | | Handling image providers via QDeclarativeExtensionPlugin is not a pattern we want to promote for library code. The plugin was also missing documentation and autotests. It might be appropriate to be re-added later as an example showing the use of an image provider with a texture factory. Change-Id: I2d8f3208aebd55180bd627b3f9acc0679eb6328c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Alter Clocks demoAlan Alpert2012-02-153-57/+105
| | | | | | | | For further component reuse, it's now a delegate in a view that can load many more clocks. Also looks better both in landscape and portrait mode. Change-Id: Ib5f172ee165554dfbe1ab84b96fe0eec7c22b1d1 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Remove pixmap text caching in TextEdit elementYann Bodson2012-02-153-92/+8
| | | | | | | Task-number: QTBUG-24278 Change-Id: Ida9014aceba93c023c88538969dff7e72ef5a6d8 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Add string comparison test for v4.Michael Brasser2012-02-152-0/+66
| | | | | Change-Id: Ibd98608ca0c757afdde1db18877a5a92cdeb24ba Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix typo in error string.Glenn Watson2012-02-141-1/+1
| | | | | | | | | Provide correct line/column information in case of error while creating dynamic qml object. Task-number: QTBUG-24065 Change-Id: I283408c898706dc6df57e21a57d97bafd56d9aaa Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add slow animations mode to qmlsceneAaron Kennedy2012-02-142-1/+10
| | | | | Change-Id: I0f850258e2cf5363bca2fa1c8b098aa5982eb232 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Doc: Overhaul of doc/src/declarative and QtQuick2 docs.Jerome Pasion2012-02-1483-3666/+5589
| | | | | | | | | | | | | | | | | | | | | | | | | | | -Consolidated model/view documentation into one. -Added a new navigation for all overviews (grouped the pages) -New front page that shows the grouping -Separated the Qt C++ from the main QML overviews -Consolidated Qt C++ into the "declarative runtime" section -New articles about JavaScript, the engine, and plugins -Fixed the older examples. New snippet comments -Renamed some of the articles -kept the qtquick2 qmlmodule -"Qt Quick Elements" Moved contents of doc/src/declarative into respective module dirs. -Qt Quick 2, LocalStorage, Particles, and QML are now separate. -Removed unused or duplicate documentation. -edited C++ examples -removed navigation and "\inqmlmodule QtQuick 2" for those pages that are not in Qt Quick 2 -fixed doc/src/ licenses to header.FDL from qtbase Change-Id: Ib36f9c07565d91160fa8d04f9670c438f684b82a Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Preserve aspect ratio when setting Image.sourceSizeMartin Jones2012-02-145-9/+69
| | | | | | | | | | | Setting both sourceSize.width and sourceSize.height results in changing the image aspect ratio. This is never what you'd want. Fit the image to the provided sourceSize, maintaining the aspect ratio. Task-number: QTBUG-21161 Change-Id: I77e9aacb8d31475d5df0aef1de52c0edbd1e2fc9 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Add new animation elements to element list.Michael Brasser2012-02-141-0/+7
| | | | | Change-Id: I714555e1255c0190619f313fc26f532f3b6f4c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Cleanup auto.pro.Michael Brasser2012-02-141-5/+3
| | | | | | | Start running qmltest tests again. Other minor cleanup. Change-Id: I0b823e3ac5ce1d894015d683b0a6bb6503538703 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix access to context properties within TextEdit.cursorDelegateAndrew den Exter2012-02-149-4/+95
| | | | | | | | | | Don't create the cursorDelegate instance before componentComplete as the context may not be fully populated prior to that. Task-number: QTBUG-21780 Change-Id: I6ca8a24989bc28e5c5ca06d61a85e32ff630ce7c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix and stabilise sectionsPositioning() testBea Lam2012-02-141-4/+13
| | | | | | | | | | | | | The 'Turn sticky footer off' part was setting the content y to 40 which meant the sect_new was already below the last visible item of the previous section, so turning off the NextLabelAtEnd flag didn't move sect_new further down the view. (This test only occasionally failed since the window didn't always update after changing the content y, but now it changes the content y then waits for a polish before continuing.) Change-Id: I6a424f4bbd2eec1904a5fd20eb2bd79d5cac5b84 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove missing image referenceAlan Alpert2012-02-141-1/+0
| | | | | | | Not really needed for this example anyways Change-Id: I98fd546441f3fd5e6caa9212cc171dab3000a139 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Better document with examples how relative paths are resolved.Andrew den Exter2012-02-141-0/+14
| | | | | Change-Id: Ia52956889216d11d7bb10307f09b582b55d0b4cd Reviewed-by: Martin Jones <martin.jones@nokia.com>
* modify 'mousearea-example' to run with MANY MORE buttonsRick Stockton2012-02-131-13/+77
| | | | | | | | | | | | | The example formerly supported only 'Qt::LeftButton' and 'Qt::RightButton'. This enhancement shows that qml can work with any of the buttons supported by Qt itself. (The example reacts to ALL 27 possible Qt mouse buttons.) Task-number: QTBUG-24132 Change-Id: Id1c1431175c39eace43e48915a47da8c4f92a1b6 Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Qt.application.inputPanel to make deprecation warning only oncePekka Vuorela2012-02-131-1/+5
| | | | | Change-Id: I6db04fdbf648e0b91e7ef21f57b6062813ceb6c5 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Fixed QML Item updates after reparenting.Kim Motoyoshi Kalland2012-02-131-4/+6
| | | | | | | | | | Setting an Item's parent to null caused its scene graph nodes to be deleted, but resetting the parent to a valid object did not recreate and update all the nodes. Task-number: QTBUG-21032 Change-Id: I00f93a481a326ba9b9fb98bf4212479622552783 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Doc: Adding images from Qt 5 bundle to doc/src/images.Jerome Pasion2012-02-1358-0/+0
| | | | | | | | | The declarative images should be in doc/src/image and not in the bundle. qdoc3 reports errors because it cannot find the images. Change-Id: Ie770cf8d0462e0e23cde33d6867dbfe30ae679f1 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Change variant properties to var properties.Justin McPherson2012-02-132-5/+5
| | | | | | | Helps with the use of js objects in test data etc. Change-Id: I95661118a8ded277c0e1d3c951182dee3f550e12 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Don't crash when an animation update causes it to delete itself.Michael Brasser2012-02-137-18/+122
| | | | | Change-Id: Ic108adfb99a09e6ede71d474240fb0917cee6961 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove non-standard canvas filter/mirror functionsCharles Yin2012-02-133-266/+1
| | | | | | | | | They are not standard context 2d APIs, and now the same effects can be implemented by the ShaderEffect/QtGraphicEffects as well, so remove them from canvas 2d to reduce the duplicated features. Change-Id: If77ea6794e839a59927a313702aeea2282384844 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add basic TouchCancel handling to canvas.Laszlo Agocs2012-02-132-1/+55
| | | | | | | | | | This makes sure that touchEvent() is properly called for all items in the scene that have an active touch. It does not handle the cancel event in any other special way. Change-Id: Id66527ced8cb63d0b29f25f37c139e6d6aec9ba0 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* qmltest: Remove obsolete skipAll function.Jason McDonald2012-02-131-6/+0
| | | | | | | | | | The skipAll function has been left in qmltest for a transitional period to give upstream projects time to catch up with the removal of the function from the API. This transitional period is now finished. Task-number: QTBUG-21652 Change-Id: I10173ef9a676b804e6cf2e7f6e9a82f7b7b4c078 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qmltest: Count passes, fails and skips consistently.Jason McDonald2012-02-134-21/+19
| | | | | | | | | | | | | | | | | | | | | This commit changes qmltest to count one pass per data row, rather than a single pass for an entire data-driven test function. This makes counting of passes consistent with counting of fails and skips which were already counted once per data row. This change also means that the plain-text, xml and light-xml output formats will now show one result per data row, so that every data row executed will be shown in the test output with either a pass, fail or skip result. Previously data rows that passed were not shown in the output, preventing analysis of total number of tests runs, pass-rates, and various other metrics. This commit corresponds to (and depends on) a commit in the qtbase module which changes the behaviour of qtestlib in the same way. Task-number: QTBUG-21848 Task-number: QTBUG-22124 Change-Id: I3c1f0e68bdff4087b9ccfc80a3f96f4541335b6f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* QML Text: make sure that the bounding rect has a y position of 0.Yann Bodson2012-02-131-0/+1
| | | | | | | This line was lost in a previous merge. Change-Id: If3683fa17630452abab115638c1c0ebf0824e2a1 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Change linkage of datafunction in V8_DEFINE_EXTENSION to static.Justin McPherson2012-02-132-2/+2
| | | | | | | Stops interaction with items of the same name elsewhere. Change-Id: I37ffdc8253d76247f03bd593785a35069636eba8 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Make sure polish() is reentrant.Justin McPherson2012-02-131-4/+5
| | | | | | | | | Take a copy of the items currently scheduled for polish (and clear the internal list) to ensure an item can re-add itself to the polish list during an updatePolish(). Change-Id: I0c629795f64d5926ac87a838ea5e216b6a1fa6cf Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix anchor jitters that could occur during animation.Michael Brasser2012-02-133-15/+15
| | | | | | | | | | | | The anchors were using a different definition of center than the actual center (9337c140cab7db1285f893b66d0e56423a74c253). With this change center-anchored Rectangles may sometimes have fuzzy antialiasing again. Task-number: QTBUG-12441 Task-number: QTBUG-21730 Change-Id: Iaf61409c7c523510d0d657fe7ba96f29a8610090 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Track the animationRunning flag correctly in ↵Charles Yin2012-02-111-0/+1
| | | | | | | | | | | | | | QQuickRenderThreadSingleContextWindowManager The animationRunning value in QQuickRenderThreadSingleContextWindowManager should always match the animation driver's running state. When the renderer starts rendering, should check and update the animationRunning to the current animation driver's isRunning() value after killing the animation timer. Change-Id: I30b55872ae1fc69b8db47ead7f1f2ee86de966c8 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Debugger: Rename QDeclarativeDebugTrace to QDeclarativeProfilerServiceKai Koehne2012-02-1019-162/+162
| | | | | | | | This avoids naming confusion with QDeclarativeTrace + makes it in line with QV8ProfilerService. Change-Id: Ifd801655044cff3ffdb2a9695ffc9868eeb51663 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Debugger: Consistenly use 'state' instead of 'status'Kai Koehne2012-02-1028-168/+168
| | | | | | | | | Fix inconsistent naming e.g. in QtDeclarativeEngineDebug by always using 'state' instead of 'status'. This is in line with the other source code, which also seems to favor 'state'. Change-Id: I65a7a3bd0eb7dfffeb37b5f8dad15b0a4a78de70 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Use QInputMethod instead of deprecated QInputPanelPekka Vuorela2012-02-1019-113/+142
| | | | | | | | | | Similarly deprecate Qt.application.inputPanel and introduce replacement Qt.inputMethod. Change-Id: Ie4fd467f93f75023c86b0a2d038d858fe5001146 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Sami Kananoja <sami.kananoja@nokia.com>
* Flickable containing PinchArea is unresponsive following pinch.Martin Jones2012-02-101-3/+0
| | | | | | | | | | | PinchArea was releasing the mouse grab when all touches were released, causing the mouse release event to not be propagated to its parents, who were then unable to correct their state. Remove this code and allow the normal event handlers to do their thing. Change-Id: I367772ca13546425fed4bed4438084bdf3c74dde Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Use only standard API in examples.Justin McPherson2012-02-109-16/+25
| | | | | Change-Id: I62a864de35c5b595ffda4397edb16342f54a86ce Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Refactor Canvas rendering paths.Justin McPherson2012-02-1026-439/+1102
| | | | | | | Refactor Canvas rendering paths to enable different drawing contexts. Change-Id: If0e00a14baa673fca6b999a787b4e89885bb1e51 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix for QTBUG-23862 - Blank screen in ViewportChristopher Ham2012-02-101-5/+4
| | | | | | | | | | This patch fixes an issue that causes Qt3D's Viewport to be blank when its renderMode property is set to BufferedRender. (QSGPainterNode's RenderTarget is set to FramebufferObject) Task-number: QTBUG-23862 Change-Id: Ic7a333f79ecf1aa153ef42e213644a17243a3580 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Remove clang warnings in particlesYann Bodson2012-02-102-7/+8
| | | | | Change-Id: I4fb92a76143e5b9b607bbf9461b27ade3776edf0 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update SmoothedAnimation and SpringAnimation to accept default target.Michael Brasser2012-02-104-6/+10
| | | | | | | Followup to f5a43c09dbbf0caece4976303250a7582f6037ec. Change-Id: I591836996b815f3128b5f67f11efcc644011d6b4 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Use use touch events to generate mouse events in Quick canvas.Martin Jones2012-02-104-19/+184
| | | | | | | | | | | | Allowing the canvas to deal with mouse event emulation provides a couple of advantages: 1. touches outside a reactive area can be ignored, allowing a touch within a reactive area to become the "mouse touch". 2. we can extend the mouse events with data available in touch events for use within the quick elements; specifically velocity in this case. Change-Id: Id9df397f1a3a03dbda2ef5dcf6189e7eb3377356 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Added new convenience readonly visibleChildren property to ItemMathias Malmqvist2012-02-105-6/+278
| | | | | | Change-Id: I5ec541226fabd72c05ce8ccb8bb7e56f6ec7717a Task-number: 22724 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Doc fixAlan Alpert2012-02-091-3/+3
| | | | | Change-Id: I94712d5e7ca81618c4c506f5984ff94c46b730dd Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove deprecated builtin sql database API.Charles Yin2012-02-096-631/+2
| | | | | | | | | | | The new local storage API has been implemented as a standalone module plugin for a while, and qtquick1 has been moved into a seperated repo, so the old API can be safely removed now. Task-number:QTBUG-21538 Change-Id: Ib89f34797afe492ad4987d5afa8ff23cdca044ab Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Debugger: Allow trace service to send data on exitKai Koehne2012-02-0911-30/+133
| | | | | | | | Add a statusAboutToBeChanged virtual that allows services to send data e.g. on application exit. Change-Id: I28fa513ab2a12d6973c444aac3062d64a0957207 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>