aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Optimization for context2d paintingCharles Yin2011-11-173-13/+12
| | | | | | | Avoid pass painting state by value. Change-Id: I86529ee7357b6cadbaa941b296d7ad025977f2aa Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use QQuickChangeListener for better performanceGunnar Sletta2011-11-162-9/+22
| | | | | Change-Id: Ia959cf905fd0a03f7f69b6b65b2eeed8e4a62153 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Debugger: Add unit tests for v8 profiler serviceKai Koehne2011-11-161-2/+2
| | | | | Change-Id: I556b9c537a43347b42669b2272925af6b05e6014 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Fix console.log function.Jędrzej Nowacki2011-11-161-3/+5
| | | | | | | | | This patch fix problem of a truncated log message if it includes an object. The regression was introduced by a7f5c93de3f9811eef3f5a19ab6dec83b997e0d6. Change-Id: I080956ef3c902b6c4a57f5d0066c4616a449e661 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Change destruction order to avoid accessing deleted GL resourcesKent Hansen2011-11-161-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes a crash when a QQuickCanvas containing a Text item is destroyed. 202127f860208c21145e05685bc54219e1655dbd in qtbase fixed a resource leak with QOpenGLMultiGroupSharedResource; resources were not cleaned up correctly when the associated GL context (group) was destroyed. This exposed a bug where QSGDefaultDistanceFieldGlyphCache (used for Text items) relied on that leakage. In particular, the glyph cache stores a pointer to a GL resource that it doesn't own (m_textureData). If the GL context is deleted and there are no other contexts in the group, the group and its resources will be deleted. Subsequently, if the glyph cache accesses the resource pointer when the Text node is destroyed (via QSGDefaultDistanceFieldGlyphCache::releaseGlyphs()), we crash. The GL context is deleted when QQuickCanvasPlainRenderLoop is destroyed. By moving the deletion of the render loop object to the end of QQuickCanvas destructor, the canvas nodes get a chance to clean up the resources they use _before_ the resources are deleted. Task-number: QTBUG-22754 Change-Id: Ie8de19a139b4631a16203e63e731feed3d8d64cf Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Allow aliases to QVariant propertiesAaron Kennedy2011-11-161-1/+2
| | | | | | Task-number: QTBUG-22464 Change-Id: I449d4fc709d34a69116258660d721596cd9b778b Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Improved comments on threaded renderer a bitGunnar Sletta2011-11-161-3/+3
| | | | | Change-Id: I1ee3879bde219e0008d70117dbfdd14f7da31f18 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Make non-threaded VME interpreter work againKent Hansen2011-11-161-2/+4
| | | | | | | | | | | | | | | | 625bb0520708879ef5d281ab0c62fc7ad5415441 added a statement to the QML_NEXT_INSTR macro without turning the macro definition into a block. This caused statements like if (foo) QML_NEXT_INSTR(bar); to unexpectedly break from the switch (the second statement in the QML_NEXT_INSTR expansion is "break"). Change-Id: I384280eaea1dd1f3b940be67d589f3a03d9e8685 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix for moving multiple items to top of viewBea Lam2011-11-161-7/+11
| | | | | | | | | | Top item wasn't positioned correctly when moving multiple items backwards to the top of the view. Don't move visibleItems.first() if we've already repositioned the top item correctly. Task-number: QTBUG-22762 Change-Id: Ib216adea719044ee55349478237473ff3194a326 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Avoid calling maybeUpdate() during ShaderEffectSource cleanup.Kim Motoyoshi Kalland2011-11-161-0/+2
| | | | | | | | | markDirtyTexture() causes sceneGraphChanged() to be emitted from the renderer containing the ShaderEffectSource, which in turn causes QQuickCanvasRenderThread::maybeUpdate() to be called. Change-Id: I3c068e41501ed4cb2c5f4ff705ffd478743b4beb Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fixed some copy-paste errors is documentation.Tero Tiittanen2011-11-161-4/+4
| | | | | Change-Id: I882df7dffea032e9fae16e87f48f70c5d26beb26 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Texture coordinates fixed in subrect tiling in SG image node.Tero Tiittanen2011-11-161-4/+9
| | | | | | | | | Fixes the texture coordinates for the inner tiles in a tiling algorithm that scenegraph default image node uses when texture is a subrect and image repeats. Change-Id: Iacf3e63c4c02bdbdc473f8128efecc7908322a50 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fixed deferred deletion of objects in the render thread loop.Kim Motoyoshi Kalland2011-11-161-1/+3
| | | | | | | processEvents() does not process DeferredDelete events. Change-Id: Iee8491b7c63a26af8e36f777d872115ab1b64763 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix refill where zero-size items are involvedBea Lam2011-11-161-8/+24
| | | | | | | | | | | | | 881091b5c0f1d2ead2b70e54f7ac2e4c17680b4e was incorrect since it meant that any items following zero-sized delegates would not be deleted as they scrolled up past the top of the view. refill() should be deleting these items as well as any zero-sized items before them. Task-number: QTBUG-22014 Change-Id: I10cd30bb85a8ec1ddaa2a1cbaa924192536ef6fc Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add optional count parameter to ListModel.removeGlenn Watson2011-11-165-17/+27
| | | | | | | | | | | When calling remove on ListModel, it's now possible to supply a second parameter giving the number of items to remove. If the count parameter is omitted, it defaults to one, which maintains the previous behaviour. Task-number: QTBUG-22601 Change-Id: I0fb5c394a2b312095ce6e99e379d0f789d3ab4e6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove unused code in qquickimplicitsizeitem.Martin Jones2011-11-163-68/+0
| | | | | Change-Id: I47ad98e0c515ddc5a9ac224048cdf396cce22699 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove events from the revert list.Michael Brasser2011-11-162-3/+19
| | | | | | | | | State change "events" should be removed from the revert list the same way property changes are. Task-number: QTBUG-22583 Change-Id: Ia3f4d16ee8855d163a7f6118a0bc1f8492727940 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Add propagateComposedEvents property to MouseAreaAlan Alpert2011-11-153-6/+49
| | | | | | | | | While necessary, advanced event propagation isn't the common use case. Now needs to be explicitly enabled. Task-number: QTBUG-21081 Change-Id: Ibd8b4974934116dbfa32cc5e72037fd9b11015b4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Make shader effects visible even if source is initially emptyGunnar Sletta2011-11-141-1/+6
| | | | | | | Task-number: QTBUG-21343 Change-Id: Iaa34d74d2458f0a9dc94c96ee13d3406e1d8f1cb Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Fix parsing of unary expressions.Roberto Raggi2011-11-141-2/+3
| | | | | | | | | | | | | | | | | | | | Prohibit the lexer to synthesize a semicolon token after the colon-sign of a binding declaration. The parser internally was rewriting the following bindings Component.onCompleted: ++foo as Component.onCompleted: ; ++foo Task-number: QTBUG-21310 Change-Id: I0558d17fd81b5abac81fb990502d49767ea40730 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Use the property cache when compiling the V4 instructions.Roberto Raggi2011-11-144-30/+28
| | | | | Change-Id: Ifca6166328e7c20707fef153fa2b960da3a00a98 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Removed annoying warning about threadingGunnar Sletta2011-11-141-7/+0
| | | | | | | Task-number: QTBUG-21707 Change-Id: I7ea7c53f39e2474093d628b5a75a435353b87b87 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixed assert during QML shutdownGunnar Sletta2011-11-141-0/+6
| | | | | Change-Id: I680af9ccb417d3162277b5740a129ecd77feee7f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Distance field glyph cache refactoring.Yoann Lopes2011-11-1418-805/+1199
| | | | | | | | | | | | | | | The distance field glyph cache is now an abstract class part of the adaptation layer. It can be implemented to define the way the glyphs are stored in graphics memory on a specific platform. The typical use case is for having a cross-process glyph cache. To implement a custom glyph cache, one has to override three pure virtual functions: requestGlyphs(), storeGlyphs() and releaseGlyphs(). The default implementation works the same way as before the refactoring (no cross-process cache). Change-Id: I6e231a119abbffbe36f5f0d690f0b8be0664ff4f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Improved QQuickShaderEffect::lookThroughShaderCode() performance.Kim Motoyoshi Kalland2011-11-141-28/+149
| | | | | | | | | Removed use of regexp. Skip comments and compiler directives in the shader code. Don't look through default shader code. Task-number: QTBUG-22423 Change-Id: Ie08cd8288ba7d7a33f1e3b0dc2ab5f2bedad04dd Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Fix memory leaks&uninitialized members in QQuickContext2D&QQuickContext2DTextureCharles Yin2011-11-143-0/+26
| | | | | | | | | | | 1) Delete m_buffer in QQuickContext2D::~QQuickContext2D 2) Add a default ctor for QQuickContext2D::State, although the reset() method is always called, but the valgrind still complains the "uninitialized" error, so add this to make an explicit initialization. 3) m_item in QQuickContext2DTexture is also not initialized. Change-Id: Ie6c74136342d7f0ff8dc268d5d6b976c95ff52f1 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Text.onLineLaidOut doc does not appearYann Bodson2011-11-141-27/+27
| | | | | | | | Task-number: QTBUG-22706 Change-Id: I2b8b7d4012e48ff4226f060a5ce38d2acdab0deb Reviewed-by: Yann Bodson <yann.bodson@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't clobber unified timer settingsAlan Alpert2011-11-141-1/+3
| | | | | Change-Id: Iee43b566180471e08d655a4d2af72e9586227532 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Debugger: Remove option to constantly send tracing dataKai Koehne2011-11-112-21/+14
| | | | | Change-Id: I392277453aa34498549e39182accf7797a262504 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QV8ProfileService: Code refactorAurindam Jana2011-11-112-2/+10
| | | | | | | Define sendProfilingData() to send data to client. Change-Id: I1f4778946af4552ef6323c78a538ab7149990b0a Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QV8Profiler: Rename the global static instanceAurindam Jana2011-11-111-2/+2
| | | | | | Change-Id: Iecd2856a36c7cf364f3d18288c2974a3bc29f91f Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Add missing includes.Jędrzej Nowacki2011-11-112-0/+2
| | | | | | | | We want to move forward declarations in qtbase. It is not good to depend on qmetatype.h to do all forwarding. Change-Id: I7d5ecec239e6c2ce5576b19f7af1c6d8d8222e7e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QV8Engine: Console APIsAurindam Jana2011-11-113-23/+87
| | | | | | | | | Modified functionality for console.log, console.debug. Added script and line information. Added functions console.warn and console.error. Change-Id: Id9f4dce5658a09b00522f8e087caf8f4242f418a Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Fix trace service for tracing on startup in block modeKai Koehne2011-11-112-3/+3
| | | | | | | | | | | Don't call QDeclarativeDebugTrace::instance() inside messageReceived, since messageReceived() will be called for the first message while the constructor is still running. Also add proper autotests for qdeclarativedebugtrace. Change-Id: Ic37d077d93ad4957fb21035abe40b2d281278314 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Support JS objects in ListModel via QVariantMapGlenn Watson2011-11-112-27/+132
| | | | | | | | | | | | Added support for the new listmodel implementation to store and retrieve JS objects via QVariantMap. Storing JS objects in a listmodel is significantly slower than storing native datatypes at the moment (this may be improved in the future). Also note that it's not currently possible to bind to fields within the JS object. Change-Id: I3b1a11ace7cdec754c1a2bb2b2d1b7edf561864d Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove unused codepaths from QV8SequenceWrapperChris Adams2011-11-112-36/+1
| | | | | | | | | | | | The object equality comparison callback does not allow an object with a sequence resource to be equal to an object with a variant resource. As such, the SequenceType::isEqual(QVariant) codepaths are not needed. Also, QVariantList conversion is handled by toBasicVariant() in the QV8Engine, and thus we don't need conversion code for this type in the sequence wrapper. Change-Id: I2ec599c5ad6cfdb715cd4e0aae3f0cc3bb36cfdf Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Export QSGDynamicTextureCharles Yin2011-11-111-1/+1
| | | | | | | | The QSGDynamicTexture is in the public header and documented, it should be exported like QSGTexture as well. Change-Id: I7c1811509b0311b177d3b9c9bdb893d1383c6d59 Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
* GridView should re-layout if add/remove before visible indexBea Lam2011-11-113-8/+20
| | | | | | | | | | Unlike ListView, GridView must redo its layout if an item is added or removed from before the visible items, since it affects the column/row layout. Task-number: QTBUG-21588 Change-Id: Id333bc653033751c45d127973e94fae4580c55b0 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Make compile and pass CI tests.Michael Brasser2011-11-112-0/+3
| | | | | Change-Id: Ie2ec20d9e346ccaf698762d6abf0224c39fb3490 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* PathView element's current item changes on insertion.Martin Jones2011-11-101-5/+18
| | | | | | | | | When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
* QStringLiteral does not build on arm gcc 4.5.2 in this conditionJohannes Zellner2011-11-101-1/+1
| | | | | | | | Replace QStringLiteral with QLatin1String Change-Id: I205bcd4f446e225c3f4054798e74dd0cb356e126 Reviewed-by: Robert Griebl <robert.griebl@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Improvements to listmodel implementation and tests.Glenn Watson2011-11-094-71/+80
| | | | | | | | | | | - Fixed edge case crash bug with QObjects being set on existing listmodel element. - Improved warning messages when assigning wrong type to role. - Removed a few code paths that can never be hit. - Added several tests to cover functionality not hit by coverage. Change-Id: I3d237c0555afbba6377b4d898bec911515b1b4ea Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Delete nodes in the render thread at shutdownAaron Kennedy2011-11-092-0/+33
| | | | | | | This fixes a crash on OS X and possibly other platforms. Change-Id: Ie8fc451b526d12d46133ef560c04e88c0b142b9a Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Fix v4 crash when accessing invalid attached propertyAaron Kennedy2011-11-091-1/+2
| | | | | | Task-number: QTBUG-21883 Change-Id: Ic14a5d494890fc1bc322c660b97f657d640f2ff8 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Return a string from resolvedUrl() to match 4.x behaviorAaron Kennedy2011-11-091-3/+3
| | | | | | Task-number: QTBUG-20960 Change-Id: I9ae99ada5c9bbe7498df24908c6acd202ca73a15 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Ensure connection lists get cleanedAaron Kennedy2011-11-091-0/+2
| | | | | | Task-number: QTBUG-21368 Change-Id: I2cdecc984edb76a5fb1417cfdb29ffe6b90b0993 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix qmltestrunner crash bug when report filename and line numberCharles Yin2011-11-092-22/+2
| | | | | | | | | | The HandleScpe is not needed here. Also for each test file, the rootObj should reset its internal states properly, otherwise the following test cases are polluted by the previous tests. Task-number:QTBUG-22620 Change-Id: I1e4869070b8712e5a6c755461d52bd12d1f03160 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix gcc compilation warningsKai Koehne2011-11-094-6/+4
| | | | | | | | QML_SHOW_FRAMERATE is a leftover from QDeclarativeView. Rest is signed vs unsigned integer comparison. Change-Id: Ie17e217fc1cf13d29a3795a40dbbc07e9c7c6067 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix expected failure in TextEdit hAlign_RightToLeft test.Andrew den Exter2011-11-091-1/+9
| | | | | | | | | Send events to the input item instead of the canvas. And apply the fix from 4.8 for the tested condition which somehow wasn't applied when the test itself was. Change-Id: I0f5bfe8fc13fc426b395fa8ef87cb5549789a92e Reviewed-by: Martin Jones <martin.jones@nokia.com>
* QDeclarativePixmapCache: Add missing enumeration values and break.Friedemann Kleint2011-11-091-1/+7
| | | | | Change-Id: Ia83a4932d50133aaae5d488d7be0df99a75be576 Reviewed-by: Martin Jones <martin.jones@nokia.com>