aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix assertAaron Kennedy2011-10-181-1/+1
| | | | | | Change-Id: I6db293c278f10be7e998ed15fe93b9d328474e6a Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Simplify expression guard logicAaron Kennedy2011-10-183-38/+44
| | | | | | Change-Id: I7d191bc8786452c5a1f14d024ff62d223adebd8b Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix TextInput echoMode test failure.Andrew den Exter2011-10-181-0/+1
| | | | | | | | | The default input method hints for a QSGItem is Qt::ImhMultiline and TextInput is a single line input so clear that default flag in init. Task-number: QTBUG-21686 Change-Id: I3b57227ee4182bf89f6789f775b56efb156df85b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove the InputContext module.Andrew den Exter2011-10-1810-1470/+1
| | | | | | | | | | | | | The input context module provided a bridge between QML and a QInputContext which allowed an application to implement it's own input method in-process. However since QInputContext has been replaced and now only exists as a QWidget compatibility API this module no longer works with the QtQuick 2 items and porting it to the new QPlatformInputContext API does not seem to be an option as there is no way to override the instance provided by the platform integration. Change-Id: Ica602377436fcea42b9ffd05e1b347e2ee52acc8 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't keep a cache of created QSGDragAttached objects.Andrew den Exter2011-10-183-17/+1
| | | | | | | It's unnecessary and can potentially return stale objects. Change-Id: Ia04b9a58757ef06d3178e6a64e168f68abc1c9d8 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Debugger: Fix compilation warningKai Koehne2011-10-171-1/+1
| | | | | Change-Id: I22fc756ce29bba2834bbdcaa40a9769a5391e337 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Fix QDeclarativeInspector when starting with ,blockKai Koehne2011-10-172-2/+13
| | | | | | Change-Id: I3797567f22f61abf59ec5332ebc74b3fa37ede93 (cherrypicked from commit 6cb43a9b72c67b71409a59fdeb419f390441f0c7) Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Create InspectorService only when debugging is enabledKai Koehne2011-10-172-4/+8
| | | | | Change-Id: Ie9704233012b0bd0e473c5ee6011e6382c61900f Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Fix coding style issuesKent Hansen2011-10-1723-135/+134
| | | | | | | Avoid Qt Sanity Bot noise when these files are moved. Change-Id: I714e949837909883fe7e387ae336d2ffc4a1912b Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Tidy up some more declarative includesKent Hansen2011-10-1716-21/+8
| | | | | | | Remove file dependencies that aren't needed. Change-Id: I0496ef9435141528f680bbd326da55c3a31e5978 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Clean up declarative includesKent Hansen2011-10-17160-543/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This commit is in preparation of moving several files to a separate library (QtQuick2).) Don't add all subfolders to the includepath (from the .pri files). There's no good reason to do that. For headers (both public and private) that are in the same folder as the file that includes them, prefer to use #include "foo.h" #include "bar_p.h" For public headers that are outside the current folder but have "unambiguous" names (e.g. qdeclarative prefix), use #include <foo.h> For private headers that are outside the current folder, use #include <private/baz_p.h> Also change #include <QtDeclarative/private/foo_p.h> to #include <private/foo_p.h> The header filenames already have a qdeclarative or qsg prefix; there's no need to prefix by module name to disambiguate. Finally, #include "private/foo_p.h" should be avoided. private/ is used for auto-generated (forwarding) headers, which never reside in the current (source) directory. Use angle brackets instead. Change-Id: I04f8477fdba043546064ee276475c09dc373f8f2 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fix GridView to repaint when geometry changesBea Lam2011-10-171-0/+1
| | | | | | Task-number: QTBUG-22078 Change-Id: Ic0ad67832dad9a7b3a7e5501893befe2d30b6c94 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Initial particle system benchmarkAlan Alpert2011-10-172-8/+10
| | | | | | | Exposed another function on ParticleSystem in order to work. Change-Id: I62acf524eb2c6491bc88fd687a0065866d7ce852 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Cannot flick to the end of a horizontal ListView with LayoutMirroringMartin Jones2011-10-175-142/+72
| | | | | | | | | | | | | | | Forward port of fix for QTBUG-21756. minXExtent calculated the offset due to highlight range incorrectly (reversed) when mirroring enabled. Also us same algorithm for fixup() in GridView and ListView uses. For QtQuick 2, this change also reverses the beginning and end highlight range, as it should be, i.e. the preferredHighlightBegin is from the right side in RightToLeft mode. Also added snapping tests. Task-number: QTBUG-21756 Change-Id: Ica0ba4ab5db0ce9c77f2da75e9f8293550bd37d1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge PropertyCache::Data and ValueTypeDataAaron Kennedy2011-10-1712-243/+273
| | | | | Change-Id: I22cbb159d009151dd77ecbcdad16f27ecb9d6dba Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Allow sizing of TrailEmitter emit area based on particle sizeAlan Alpert2011-10-172-13/+23
| | | | | Change-Id: I7ce2ba29459b9a66e62933f9bfb9e066baedaaef Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add Move affectorAlan Alpert2011-10-145-2/+294
| | | | | | | | | Slated to replace the 'Gravity' affector which only did one specialized gravity usecase anyways. This one is more generic. Change-Id: I3cbb975bad24e8f6fca7e07b671aa8ba5a3a916c Reviewed-on: http://codereview.qt-project.org/6657 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix insertions above the visible indexBea Lam2011-10-144-82/+129
| | | | | | | | | | | | | | | | | The first visible item was repositioned incorrectly after an insertion above the visible index since any insertions above the position + cache buffer were ignored and not considered for repositioning the first item. GridView insertion code has changed to be similar to the ListView implementation to fix various issues when inserting above the visible index and to remove code that crossed indexes from visibleItems with model indexes and visible indexes. Also adds extra insertion tests for ListView and GridView. Change-Id: I5e129c605fdad733b61bd29850465b3b752fb63f Reviewed-on: http://codereview.qt-project.org/6485 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove QMetaObjectBuilder from declarative.Friedemann Kleint2011-10-149-2938/+6
| | | | | | | | Link on Windows. Change-Id: Idca11c1a21ad5aebf79d6487692d912b4dea249f Reviewed-on: http://codereview.qt-project.org/6553 Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* (private-) export QSGShaderEffectTexturejuhvu2011-10-141-1/+1
| | | | | | | | | | | | | | | | | | QtLocation maps need to be able to render standard QML elements as Map items (for example a convenience store logo and text). Prior to Qt5 this was achieved with Qt graphics view framework. This export is needed in order to be able to ask QML engine to generate/update/render textures as needed. Only private symbol really used is the updateTextures(). This commit complements the related earlier commit 1780033cb259bbb166fe9b4b14c92829a8e1800e Change-Id: I98b2083b6a4d25fdd113ac4d95a9b9a2bb13a1f1 Reviewed-on: http://codereview.qt-project.org/6475 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* only use one QSGView instance for all qml test casesCharles Yin2011-10-141-13/+14
| | | | | | Change-Id: I9296e30d216b57d8cf2a11e94030781f03594aa6 Reviewed-on: http://codereview.qt-project.org/6646 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* QDeclarativeIncubator wasn't calling statusChanged() for nested casesAaron Kennedy2011-10-142-21/+34
| | | | | | | Change-Id: I1811951bdcdd69d4ad1643ed54a8ea097fa718b5 Reviewed-on: http://codereview.qt-project.org/6638 Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix creation context for delegatesBea Lam2011-10-141-1/+3
| | | | | | | | | As per cdf868033bbd7bf5a996c67fa56f8ac15e755115 for ListView and GridView. Change-Id: I6928a1fd4df51265124925530e81704dbdc5af46 Reviewed-on: http://codereview.qt-project.org/6629 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove unneeded includeKent Hansen2011-10-141-1/+0
| | | | | | Change-Id: I8db00cee46dfb7f2a3bc4e73d093be3d766a8f7c Reviewed-on: http://codereview.qt-project.org/6486 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* QDeclarativeDebugTrace: Speed up appending elements to traceKai Koehne2011-10-121-1/+4
| | | | | | | | Using a QVector with a Q_MOVABLE_TYPE with QVector should speed up appending stuff by a magnitude. Change-Id: Icf5cee87a0f35d81bf85f833f5656a9b296c80fd Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Fix V8 heap snapshot in profiler serviceMikko Harju2011-10-121-10/+8
| | | | | | | | | | | Fixes the message parsing (use the option also for heap snapshot commands). Do not directly serialize the snapshot to the QByteArray under QDataStream. Change-Id: I3ad15a2debd6c2f912854610b6434744e0acd788 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Provide a context when constructing a TextInput cursor delegate.Andrew den Exter2011-10-122-2/+8
| | | | | | | | | | | Without a context the delegate won't be able to refer to any external properties. Task-number: QTBUG-21780 Change-Id: I7171787e677ce67466b311796693ed88bcacb718 Reviewed-on: http://codereview.qt-project.org/5837 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Rename QDeclarativeV4 -> QV4Aaron Kennedy2011-10-1218-265/+264
| | | | | | | Change-Id: Ic35e0ad1663cafe4aa535594dc3999a2d317ce0e Reviewed-on: http://codereview.qt-project.org/6301 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
* fix crash bug when unloading canvasCharles Yin2011-10-123-5/+2
| | | | | | | | Task-number:QTBUG-21935 Change-Id: If4a2a92b2f53cf81a48d023df8a1e6d11e522e0d Reviewed-on: http://codereview.qt-project.org/6370 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* fix several canvasitem bugsCharles Yin2011-10-125-10/+32
| | | | | | | Change-Id: I6a6d97253fe66184736f8ac089e97aa114f0e83a Reviewed-on: http://codereview.qt-project.org/6405 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Allow view items to be preserved.Andrew den Exter2011-10-124-30/+139
| | | | | | | | | | | | | | | | | | | | Do not destroy items that are members of the VisualDataModel persistedItems group when they are released by the view. The create function on VisualDataGroup will return a reference to an instantiated item within that group, any item returned by this function is automatically added to the persistedItems group and can be released by removing it from the group. Uninstantiated items added to the persistedItems group by any other means are not instantiated until requested by a view or create. Task-number: QTBUG-21518 Task-number: QTBUG-20854 Change-Id: I59554711208504c8f20a3ebe783bddab9b21a558 Reviewed-on: http://codereview.qt-project.org/5831 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove aggregated heap snapshotsAaron Kennedy2011-10-121-3/+1
| | | | | | | | | | Newer versions of v8 only support full snapshots. Change-Id: I2c6778579bdb2ec1cc38868bf4fa76ce3fbc1633 Reviewed-on: http://codereview.qt-project.org/6406 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Optimize signal handlingAaron Kennedy2011-10-1216-487/+404
| | | | | | | | | | | | | | | Bindings connect to lots of signals that are never emitted. By managing signal connection lists ourselves, we can do a much better job than Qt's generic signal/slot connection logic. Also, by connecting to QDeclarativeNotifierEndpoint's rather than QObject slots, we can eliminate the need to instantiate a QObject for the V4 and V8 binding managers. Change-Id: I598667deaefdbd2860227bd74378a1b196761686 Reviewed-on: http://codereview.qt-project.org/6278 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
* Component.incubateObject() autotestAaron Kennedy2011-10-121-4/+57
| | | | | | | Change-Id: I37f76d5b273ae4f032c4de5ac8fcbff4204b78fe Reviewed-on: http://codereview.qt-project.org/6200 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
* Improvements to text layouting in QMLYann Bodson2011-10-124-14/+229
| | | | | | | | | | | | | | | Allow more control over the text layouting process in QML. Give access to every text line through a hook, this gives the opportunity to position and resize a line as it is being laid out. It is then possible to lay out the text in columns or around other objects. Task-number: QTBUG-21367 Change-Id: I56dc0c1c4b575dc06360c135098024d0324d3656 Reviewed-on: http://codereview.qt-project.org/5351 Reviewed-by: Yann Bodson <yann.bodson@nokia.com> Sanity-Review: Yann Bodson <yann.bodson@nokia.com>
* QmlProfiler: send end of trace eventChristiaan Janssen2011-10-112-1/+6
| | | | | | | Change-Id: I2e857028bde15145d5d01c6f5325a4ceabb37e27 Reviewed-on: http://codereview.qt-project.org/6434 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* More accurate timing for rendering threadJiang Jiang2011-10-111-3/+29
| | | | | | | | | | | | To get a better overview of how much time we consumed rendering each frame, setting QElapsedTimer around each loop in the rendering thread. It can be turned on with QML_CANVAS_TIMING=1 environment variable. Change-Id: I81a231983e5f7d898589d5fe18782dd5c7e8e0dc Reviewed-on: http://codereview.qt-project.org/6420 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QmlProfiler: tracking animationsChristiaan Janssen2011-10-112-7/+49
| | | | | | | Change-Id: I78fa5ed5385dfe1715c9d05a5e63eb7185870e61 Reviewed-on: http://codereview.qt-project.org/6254 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* QInputPanel exposed as a property from QDeclarativeApplicationSami Kananoja2011-10-114-1/+17
| | | | | | | | | Task-number: QTBUG-21449 Change-Id: I437f80f4d1f0dbb3cb410940213eae50a4cef2cd Reviewed-on: http://codereview.qt-project.org/5852 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix layout issues with recently removed items.Andrew den Exter2011-10-111-12/+15
| | | | | | | | | | | | Items removed from the source model aren't removed from the cache group until they've also been released by the view. Skip over these removed items when translating future changes to the source model so no invalid translated changes are created. Change-Id: I9bf3801135e78b5a6493b4ef50ce44ee5c912bfc Reviewed-on: http://codereview.qt-project.org/6298 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* fix canvas bugCharles Yin2011-10-112-14/+7
| | | | | | | | | | | do painting only after component loaded and paint after geometry size initialized Task-number:QTBUG-21920 Task-number:QTBUG-21918 Change-Id: Ibbc12d416dc694eff35f16c03cbc3c16e333645b Reviewed-on: http://codereview.qt-project.org/6387 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Expand QSGImageParticle testAlan Alpert2011-10-113-0/+9
| | | | | | | | | | | | Now tests all performance levels. Also fixes an emitter timing edge-case which might be destabilizing the tests. Change-Id: I5e2f133dc4b96dd05d49e7e983ae630e379fa66b Reviewed-on: http://codereview.qt-project.org/6313 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Documentation AugmentationAlan Alpert2011-10-111-1/+2
| | | | | | | | | The performance implications of adding an affector should be mentioned. Change-Id: I0d508b0dfd16a7e9a56bf5f3c7797d1f4dd6a609 Reviewed-on: http://codereview.qt-project.org/6314 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Initialize new particle data membersAlan Alpert2011-10-111-0/+8
| | | | | | | Change-Id: I1ba5aac70e662d64f9007a18465f520c8912ecf6 Reviewed-on: http://codereview.qt-project.org/6309 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use QBasicAtomicInt load() and store() instead of implicit castingBradley T. Hughes2011-10-104-16/+16
| | | | | | | | | | | | | The implicit casts will be unavailable in the near future. This is a follow up to commit 7f8472af8c03296be9e9ce50d8e9b3089eedf2f1, which didn't catch all usages of the implicit cast and assignment operator. Change-Id: If05c343e2851b41e4a351c56328c4406c688fa0d Reviewed-on: http://codereview.qt-project.org/6351 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update SpriteImage to modern standardsAlan Alpert2011-10-1023-731/+425
| | | | | | | | | | | | | | | Includes updating shaders to contain the recent size flexibilities added to QSGImageParticle, adding documentation, moving shaders into the source file, and optional interpolation. Small doc fixes, moving shaders into the source file, and moving the resources (because there are no longer any shaders there) were applied to ImageParticle and Turbulence (last user of particles resources). Change-Id: I5e2f133dc4b96dd05d49e7e983ae630e379fa66f Reviewed-on: http://codereview.qt-project.org/6303 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use QBasicAtomicInt load() and store() instead of implicit castingBradley T. Hughes2011-10-101-4/+4
| | | | | | | | | The implicit casts will be unavailable in the near future Change-Id: Ieab3603e500d3621e65f96d970c9935be7f3aa52 Reviewed-on: http://codereview.qt-project.org/6229 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add "asynchronous" property to Loader.Martin Jones2011-10-105-75/+167
| | | | | | | | | | Use an incubator to perform non-blocking instantiation of components. Change-Id: I589bfc8ba7bf3368dc44fab3a82afb7e0d66032c Fixes: QTBUG-21791 Reviewed-on: http://codereview.qt-project.org/6216 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Add DropArea item and Drag attached property.Andrew den Exter2011-10-1016-800/+1350
| | | | | | | | | | | | | | | | | | | Refactors drag API to improve compatibility with traditional drag and drop by reusing events and adding drop actions. Event sending is removed from MouseArea, instead the Drag object can be attached to the item that is dragged and it will send drag events when the position of that item is changed or when its active property changes. The DragTarget item is renamed to DropArea and can now communicate supported and suggested actions. Task-number: QTBUG-19747 Change-Id: I46cb77e68cf1ff32bbcbf0945facb593c9c2243c Reviewed-on: http://codereview.qt-project.org/4638 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Documentation AugmentationAlan Alpert2011-10-101-2/+2
| | | | | | | | | The property name changed, the docs should change too Change-Id: Idcdb9eaf570a7189da1ea00c9482fd1f72371906 Reviewed-on: http://codereview.qt-project.org/6189 Reviewed-by: Martin Jones <martin.jones@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>