profile/ivi/qtdeclarative.git
13 years agoSupport refreshing V8 bindings
Aaron Kennedy [Wed, 22 Jun 2011 08:30:04 +0000 (18:30 +1000)]
Support refreshing V8 bindings

13 years agoCorrect rounding behavior
Aaron Kennedy [Wed, 22 Jun 2011 08:29:52 +0000 (18:29 +1000)]
Correct rounding behavior

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8
Aaron Kennedy [Wed, 22 Jun 2011 08:12:29 +0000 (18:12 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8

13 years agoCorrectly wait for render thread to exit
Aaron Kennedy [Wed, 22 Jun 2011 08:11:06 +0000 (18:11 +1000)]
Correctly wait for render thread to exit

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8
Aaron Kennedy [Wed, 22 Jun 2011 06:13:23 +0000 (16:13 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8

Conflicts:
src/declarative/items/qsgcontext2d.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
tests/auto/declarative/declarative.pro
tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp

13 years agoFix autotests
Aaron Kennedy [Wed, 22 Jun 2011 03:04:30 +0000 (13:04 +1000)]
Fix autotests

13 years agoQSKIP crashing tests until QTBUG-20017 is fixed
Aaron Kennedy [Wed, 22 Jun 2011 02:10:47 +0000 (12:10 +1000)]
QSKIP crashing tests until QTBUG-20017 is fixed

13 years agoMake QSGCanvas::grabFrameBuffer() more reliable
Aaron Kennedy [Wed, 22 Jun 2011 01:20:43 +0000 (11:20 +1000)]
Make QSGCanvas::grabFrameBuffer() more reliable

13 years agoFix text decoration position for simple Text node
Jiang Jiang [Tue, 21 Jun 2011 14:46:15 +0000 (16:46 +0200)]
Fix text decoration position for simple Text node

13 years agoqmlplugindump: Add -v option.
Christian Kamm [Tue, 21 Jun 2011 09:59:49 +0000 (11:59 +0200)]
qmlplugindump: Add -v option.

Reviewed-by: Kai Koehne
(cherry picked from commit 9b09ef514bb6c4c926440e3fbf19d7255f97a12f)

13 years agoqmlplugindump: Fix emitted tooling version.
Christian Kamm [Tue, 21 Jun 2011 08:43:14 +0000 (10:43 +0200)]
qmlplugindump: Fix emitted tooling version.

Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1.

Reviewed-by: Kai Koehne
(cherry picked from commit 9f0fda822aec47da201ae79e6bc807294196a8a2)

13 years agoDrag items relative to their scene position.
Andrew den Exter [Tue, 21 Jun 2011 07:00:46 +0000 (17:00 +1000)]
Drag items relative to their scene position.

This preserves the absolute position of a dragged item when its parent
is changed.

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Tue, 21 Jun 2011 05:31:40 +0000 (15:31 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoOnly print debugging when THREAD_DEBUG is enabled
Aaron Kennedy [Tue, 21 Jun 2011 05:21:35 +0000 (15:21 +1000)]
Only print debugging when THREAD_DEBUG is enabled

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Tue, 21 Jun 2011 02:03:07 +0000 (12:03 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoRewrite last rewrite
Alan Alpert [Tue, 21 Jun 2011 02:02:08 +0000 (12:02 +1000)]
Rewrite last rewrite

Also rewrite to have all particle state shared, not just common
elements.

13 years agoFix typo and put the correct snippets in the output.
Casper van Donderen [Mon, 20 Jun 2011 15:42:51 +0000 (17:42 +0200)]
Fix typo and put the correct snippets in the output.

Reviewed-by: David Boddie
13 years agoStart out with a distance field cache that fits more characters
Gunnar Sletta [Mon, 20 Jun 2011 12:18:46 +0000 (14:18 +0200)]
Start out with a distance field cache that fits more characters

13 years agoCompile when qreal is not a double
Gunnar Sletta [Mon, 20 Jun 2011 10:21:33 +0000 (12:21 +0200)]
Compile when qreal is not a double

13 years agoCompile fix for MSVC.
Kim Motoyoshi Kalland [Mon, 20 Jun 2011 09:55:18 +0000 (11:55 +0200)]
Compile fix for MSVC.

13 years agoRemoved unnecessary calls to QSGNode::destroy().
Kim Motoyoshi Kalland [Mon, 20 Jun 2011 08:53:34 +0000 (10:53 +0200)]
Removed unnecessary calls to QSGNode::destroy().

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Mon, 20 Jun 2011 07:47:47 +0000 (09:47 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoMerge branch 'master' into qtquick2
Gunnar Sletta [Mon, 20 Jun 2011 07:22:36 +0000 (09:22 +0200)]
Merge branch 'master' into qtquick2

13 years agoImplement caching of the distance fields...
Gunnar Sletta [Mon, 20 Jun 2011 07:20:14 +0000 (09:20 +0200)]
Implement caching of the distance fields...

Change-Id: I823341b9b53e885dcd004e17e319cf033dc21c45

13 years agoAdd "DELETE" support to XMLHttpRequest
Aaron Kennedy [Mon, 20 Jun 2011 05:22:08 +0000 (15:22 +1000)]
Add "DELETE" support to XMLHttpRequest

13 years agoOptimize common binding writes
Aaron Kennedy [Mon, 20 Jun 2011 04:57:10 +0000 (14:57 +1000)]
Optimize common binding writes

13 years agoReenable shared bindings
Aaron Kennedy [Mon, 20 Jun 2011 04:47:44 +0000 (14:47 +1000)]
Reenable shared bindings

Now with extra "supports nested components" goodness.

13 years agoAdd QDeclarativeChangeSet.
Andrew den Exter [Sun, 19 Jun 2011 22:31:50 +0000 (08:31 +1000)]
Add QDeclarativeChangeSet.

Takes a sequence of model changes and reorders and compresses them so
that like changes are grouped together and are ordered from start to
end.  The order is Removed, Inserted, Moved then Changed.

13 years agoTemporarily disable shared V8 bindings
Aaron Kennedy [Fri, 17 Jun 2011 07:43:45 +0000 (17:43 +1000)]
Temporarily disable shared V8 bindings

There is a bug with nested components sharing the outer components
shared binding list, which is obviously wrong.

13 years agoCompare QDeclarativeProperty's in a flag agnostic way
Aaron Kennedy [Fri, 17 Jun 2011 07:11:13 +0000 (17:11 +1000)]
Compare QDeclarativeProperty's in a flag agnostic way

13 years agoMerge branch 'qtquick2' into v8
Aaron Kennedy [Fri, 17 Jun 2011 02:48:20 +0000 (12:48 +1000)]
Merge branch 'qtquick2' into v8

13 years agoDon't leak memory in benchmark
Aaron Kennedy [Fri, 17 Jun 2011 01:43:09 +0000 (11:43 +1000)]
Don't leak memory in benchmark

13 years agoEvaluate all shared bindings together using a shared context
Aaron Kennedy [Fri, 17 Jun 2011 01:37:17 +0000 (11:37 +1000)]
Evaluate all shared bindings together using a shared context

The vast majority of bindings are capable of being shared (that is, don't
introduce closures themselves) and consequently this improves the
performance of almost every app.

13 years agoAdd "shared mode" to QML contexts
Aaron Kennedy [Thu, 16 Jun 2011 05:39:12 +0000 (15:39 +1000)]
Add "shared mode" to QML contexts

13 years agoCleanup
Aaron Kennedy [Thu, 16 Jun 2011 05:38:40 +0000 (15:38 +1000)]
Cleanup

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Thu, 16 Jun 2011 04:08:29 +0000 (14:08 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoOutput the rewritten binding with QML_REWRITE_DUMP
Aaron Kennedy [Thu, 16 Jun 2011 00:33:09 +0000 (10:33 +1000)]
Output the rewritten binding with QML_REWRITE_DUMP

13 years agoMerge branch 'master' into qtquick2
Gunnar Sletta [Wed, 15 Jun 2011 17:00:08 +0000 (19:00 +0200)]
Merge branch 'master' into qtquick2

Conflicts:
src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp

Change-Id: Id2267925c4f77b41f63bbbf555b816ca1f55a0ec

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Wed, 15 Jun 2011 13:47:32 +0000 (15:47 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoSpeed up distance field generation by another 20% or so.
Gunnar Sletta [Wed, 15 Jun 2011 13:46:22 +0000 (15:46 +0200)]
Speed up distance field generation by another 20% or so.

13 years agoSpeed up distance field generation by 5-20%
Gunnar Sletta [Wed, 15 Jun 2011 13:02:58 +0000 (15:02 +0200)]
Speed up distance field generation by 5-20%

13 years agoRenamed QMLRenderer -> QSGDefaultRenderer
Gunnar Sletta [Wed, 15 Jun 2011 09:51:15 +0000 (11:51 +0200)]
Renamed QMLRenderer -> QSGDefaultRenderer

Change-Id: Ib1f00d45cecd3b438148adce2f7cf247030b2dfb

13 years agoRemove annoying warning
Gunnar Sletta [Wed, 15 Jun 2011 09:32:49 +0000 (11:32 +0200)]
Remove annoying warning

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Wed, 15 Jun 2011 08:55:41 +0000 (18:55 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoRewrite particle system to cope with changing particle counts
Alan Alpert [Wed, 15 Jun 2011 08:52:26 +0000 (18:52 +1000)]
Rewrite particle system to cope with changing particle counts

And might do it again...
Caught up in this massive change were the following smaller ones:
-Some custom particle examples
-delegate property on ItemParticle and an example with it

13 years agoPrint out a warning when attributes are enabled
Gunnar Sletta [Wed, 15 Jun 2011 08:08:43 +0000 (10:08 +0200)]
Print out a warning when attributes are enabled

13 years agoDisable attributes from shader effects
Gunnar Sletta [Wed, 15 Jun 2011 07:48:49 +0000 (09:48 +0200)]
Disable attributes from shader effects

Reviewed-by: Samuel
13 years agoFix autotests
Aaron Kennedy [Wed, 15 Jun 2011 04:19:22 +0000 (14:19 +1000)]
Fix autotests

13 years agoUpdate V8
Aaron Kennedy [Wed, 15 Jun 2011 04:07:58 +0000 (14:07 +1000)]
Update V8

13 years agoCleanup autotest pro file
Aaron Kennedy [Wed, 15 Jun 2011 04:07:30 +0000 (14:07 +1000)]
Cleanup autotest pro file

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8
Aaron Kennedy [Wed, 15 Jun 2011 02:35:14 +0000 (12:35 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8

13 years agoRegister QList<QObject*> metatype
Aaron Kennedy [Wed, 15 Jun 2011 00:04:18 +0000 (10:04 +1000)]
Register QList<QObject*> metatype

13 years agoCorrect handling of CONSTANT properties
Aaron Kennedy [Wed, 15 Jun 2011 00:03:50 +0000 (10:03 +1000)]
Correct handling of CONSTANT properties

Were being marked as missing a notifier instead.

13 years agoInitialize member variable
Gunnar Sletta [Tue, 14 Jun 2011 07:49:58 +0000 (09:49 +0200)]
Initialize member variable

13 years agoPerformance improvements
Aaron Kennedy [Tue, 14 Jun 2011 06:17:39 +0000 (16:17 +1000)]
Performance improvements

There are two main changes here.  First, where possible, we mark
properties as "IsDirect" which means that they exist in a C++
QMetaObject (as opposed to a dynamic meta object), which allows us
to call QObject::qt_metacall() directly, bypassing any dynamic meta
object stuff.

The second change is to use an ascii string comparator in V8 where
possible.  V8 stores ASCII string internally as ASCII strings, and
asking it to compare them to a UTF16 string requires a conversion.

13 years agoUpdate V8
Aaron Kennedy [Tue, 14 Jun 2011 06:16:40 +0000 (16:16 +1000)]
Update V8

13 years agoUpdate auto tests
Aaron Kennedy [Tue, 14 Jun 2011 06:08:01 +0000 (16:08 +1000)]
Update auto tests

Following merge, and after removing all QtScript usage from
QDeclarativeEngine.

13 years agoSafer cleanup in model/item particle
Alan Alpert [Tue, 14 Jun 2011 04:09:30 +0000 (14:09 +1000)]
Safer cleanup in model/item particle

13 years agoAdd QHashedV8String to improve lookup performance
Aaron Kennedy [Tue, 14 Jun 2011 01:52:30 +0000 (11:52 +1000)]
Add QHashedV8String to improve lookup performance

Also inline QV8QObjectWrapper::getProperty() which significantly
improves context lookups which contain a lot of QObject property
lookup misses.

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Tue, 14 Jun 2011 01:45:20 +0000 (11:45 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoFix failing test.
Martin Jones [Tue, 14 Jun 2011 00:21:52 +0000 (10:21 +1000)]
Fix failing test.

Change ccf706d0bb2d9f70f5a8c18e4aab8ee7e6369817 changed the
instruction dump() format.

Change-Id: I86677cc176568728b8044d8abfce9121773e9c56

13 years agoQDeclarativeDebug: Don't hang if started with ',block' argument
Kai Koehne [Wed, 8 Jun 2011 18:51:07 +0000 (20:51 +0200)]
QDeclarativeDebug: Don't hang if started with ',block' argument

Fixes regression introduced in a59261454071

Reviewed-by: Christiaan Janssen
(cherry picked from commit e3b5de8651586cf5484fd8ab217cddf17f0fe01e)

13 years agoQDeclarativeDebug: Fix QJSDebugService if launched with ',block'
Kai Koehne [Wed, 8 Jun 2011 09:01:26 +0000 (11:01 +0200)]
QDeclarativeDebug: Fix QJSDebugService if launched with ',block'

If the debugger is launched in blocking mode the service will be enabled
from the start.

Reviewed-by: Thorbjorn Lindeijer
(cherry picked from commit c038e3505309bb954123493cb5f96c73e114f3d0)

13 years agoUse linked list instead of QList for node children.
Kim Motoyoshi Kalland [Tue, 31 May 2011 16:32:46 +0000 (18:32 +0200)]
Use linked list instead of QList for node children.

13 years agoRemoved matrix stacks from QSGRenderer.
Kim Motoyoshi Kalland [Tue, 31 May 2011 11:48:53 +0000 (13:48 +0200)]
Removed matrix stacks from QSGRenderer.

13 years agoMake min-heap member of QMLRenderer instead of stack variable.
Kim Motoyoshi Kalland [Mon, 30 May 2011 15:18:16 +0000 (17:18 +0200)]
Make min-heap member of QMLRenderer instead of stack variable.

The heap is used to sort non-overlapping children.

13 years agoReplaced QStack with QDataBuffer in the node updater.
Kim Motoyoshi Kalland [Mon, 30 May 2011 14:31:53 +0000 (16:31 +0200)]
Replaced QStack with QDataBuffer in the node updater.

13 years agoCut off blocked sub-trees one node earlier.
Kim Motoyoshi Kalland [Fri, 10 Jun 2011 12:03:55 +0000 (14:03 +0200)]
Cut off blocked sub-trees one node earlier.

Do not even enter the blocked node.

13 years agoRemoved QSGNodeVisitor inheritance from QSGNodeUpdater.
Kim Motoyoshi Kalland [Fri, 10 Jun 2011 11:59:13 +0000 (13:59 +0200)]
Removed QSGNodeVisitor inheritance from QSGNodeUpdater.

This reduces the number of virtual function calls.

13 years agoMerge branch 'master' into qtquick2
Gunnar Sletta [Fri, 10 Jun 2011 11:41:43 +0000 (13:41 +0200)]
Merge branch 'master' into qtquick2

13 years agoDisable vsync animations by default
Gunnar Sletta [Fri, 10 Jun 2011 11:40:48 +0000 (13:40 +0200)]
Disable vsync animations by default

Change-Id: Ia614915ddb96f5c51e9883885479f1269ab361ed

13 years agoAdded QSGNode::removeAllChildNodes().
Kim Motoyoshi Kalland [Fri, 10 Jun 2011 11:35:50 +0000 (13:35 +0200)]
Added QSGNode::removeAllChildNodes().

13 years agoKeep track of the number of geometry nodes in a sub-graph.
Kim Motoyoshi Kalland [Fri, 10 Jun 2011 11:35:37 +0000 (13:35 +0200)]
Keep track of the number of geometry nodes in a sub-graph.

If there are no geometry nodes in a sub-graph, there's no need
to update it.

13 years agoAdd delegate property to ItemParticle
Alan Alpert [Fri, 10 Jun 2011 06:07:33 +0000 (16:07 +1000)]
Add delegate property to ItemParticle

Also add burst(n,x,y) to ParticleEmitter, and a demo that uses both.

13 years agoUse fast property accessors for readonly properties
Aaron Kennedy [Fri, 10 Jun 2011 04:13:01 +0000 (14:13 +1000)]
Use fast property accessors for readonly properties

13 years agoMerge branch 'qtquick2' into v8
Aaron Kennedy [Fri, 10 Jun 2011 03:50:03 +0000 (13:50 +1000)]
Merge branch 'qtquick2' into v8

13 years agoAdd JavaScript benchmark
Aaron Kennedy [Fri, 10 Jun 2011 03:46:44 +0000 (13:46 +1000)]
Add JavaScript benchmark

13 years agoCreate property cache in case of Component{} root
Aaron Kennedy [Fri, 10 Jun 2011 02:29:04 +0000 (12:29 +1000)]
Create property cache in case of Component{} root

Change-Id: I36f969d09d8ce5e0b68b657b514586990e88ebe4
Task-number: QTBUG-19354
(cherry picked from commit af1350249ea9de68e1c4b72ed1179948aa28ca19)

13 years agoUpdate v8 to include ARM patches
Aaron Kennedy [Fri, 10 Jun 2011 02:22:04 +0000 (12:22 +1000)]
Update v8 to include ARM patches

13 years agoAllow v8 autotest to run without Qt
Aaron Kennedy [Fri, 10 Jun 2011 01:53:56 +0000 (11:53 +1000)]
Allow v8 autotest to run without Qt

13 years agoUse optimized QObject wrapper whenever it is possible
Aaron Kennedy [Fri, 10 Jun 2011 00:29:05 +0000 (10:29 +1000)]
Use optimized QObject wrapper whenever it is possible

13 years agoFix QDeclarativeInstruction autotest failure.
Michael Brasser [Thu, 9 Jun 2011 22:46:52 +0000 (08:46 +1000)]
Fix QDeclarativeInstruction autotest failure.

ccf706d0bb2d9f70f5a8c18e4aab8ee7e6369817 added additional information
to dump for StoreScriptString.

13 years agoAdd QML translation autotests.
Michael Brasser [Thu, 9 Jun 2011 06:18:05 +0000 (16:18 +1000)]
Add QML translation autotests.

13 years agoDoc: Cleaned up the scene graph documentation a little.
David Boddie [Thu, 9 Jun 2011 13:23:08 +0000 (15:23 +0200)]
Doc: Cleaned up the scene graph documentation a little.

13 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging
Gunnar Sletta [Thu, 9 Jun 2011 10:56:27 +0000 (12:56 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging

13 years agoUse the Qt 4 function for updatesEnabled()
Gunnar Sletta [Thu, 9 Jun 2011 10:55:49 +0000 (12:55 +0200)]
Use the Qt 4 function for updatesEnabled()

Change-Id: I78bf3b8acff54b83493aebc480e7f9b4f32c1c70

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Thu, 9 Jun 2011 09:01:51 +0000 (19:01 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoDo delegate management outside the render thread
Alan Alpert [Thu, 9 Jun 2011 09:00:33 +0000 (19:00 +1000)]
Do delegate management outside the render thread

Very simple implementation, there's probably a better way to do it.

13 years agoAdd a DragTarget element.
Andrew den Exter [Thu, 9 Jun 2011 08:29:50 +0000 (18:29 +1000)]
Add a DragTarget element.

Provides an area that can be used to handle events when other items are
dragged over it.

Task-number: QMLNG-32

13 years agoNotify when the TextInput cursorRectangle property changes within pre-edit
Andrew den Exter [Fri, 20 May 2011 04:22:39 +0000 (14:22 +1000)]
Notify when the TextInput cursorRectangle property changes within pre-edit

Anything that updates the horizontal scroll is also likely to change the
position of the cursor rectangle and the micro focus.  So group these
actions together and ensure they're done before emitting
cursorPositionChanged() so positionToRectangle() returns a valid value
from that handler.

Change-Id: I5fadc58efb148a8dabe88a94381c86cd64dba3bd
Task-number: QTBUG-19089
Reviewed-by: Martin Jones
(cherry picked from commit a0b2fc44ff8752193cacde52276b1822741f5374)

13 years agoMake TextEdit word selection more natural.
Andrew den Exter [Fri, 13 May 2011 03:49:20 +0000 (13:49 +1000)]
Make TextEdit word selection more natural.

QTextControl will only extend the selection to a word if the cursor is
directly over it which prevents the selection being extended if the
mouse is dragged up or down a to a shorter line of text making it
difficult to select multiple lines of text.  Just disable that
limitation when the TextEdit word selection is enabled.

Change-Id: I3b9d1575c0141db8441197d740de94a90eacc077
Task-number: QTBUG-19230
Reviewed-by: Martin Jones
13 years agoEnsure the TextEdit cursor delegate is repositioned on mouse events.
Andrew den Exter [Mon, 9 May 2011 03:57:34 +0000 (13:57 +1000)]
Ensure the TextEdit cursor delegate is repositioned on mouse events.

Update the micro focus when a mouse press changes the cursor position
of a read only TextEdit.

Change-Id: I11855037f7938b2cd23ac6ad165722b5289b4f46
Task-number: QTBUG-19109
Reviewed-by: Martin Jones
13 years agoFix memory leak with AnimatedImage elements.
Gunnar Sletta [Tue, 7 Jun 2011 08:46:00 +0000 (10:46 +0200)]
Fix memory leak with AnimatedImage elements.

When textures are constructed from pixmaps, we need to store
the context they were constructed in so that they may also
be cleaned up later.

Change-Id: Ibdf5f60b598914d630c622341fae206f46cb9629

13 years agoMerge branch 'master' into qtquick2
Gunnar Sletta [Thu, 9 Jun 2011 07:37:42 +0000 (09:37 +0200)]
Merge branch 'master' into qtquick2

13 years agoSupport calling update while syncing scenegraph.
Gunnar Sletta [Thu, 9 Jun 2011 07:14:54 +0000 (09:14 +0200)]
Support calling update while syncing scenegraph.

The variable inSync is written from the scene graph thread
and read from the GUI thread, but this is safe as it is
only written to during the sync phase, during which the
GUI thread is already blocked.

13 years agoMerge branch 'qtquick2' into v8
Aaron Kennedy [Thu, 9 Jun 2011 06:22:45 +0000 (16:22 +1000)]
Merge branch 'qtquick2' into v8

Conflicts:
src/declarative/qml/qml.pri

13 years agoMerge branch 'master' into qtquick2
Aaron Kennedy [Thu, 9 Jun 2011 05:31:31 +0000 (15:31 +1000)]
Merge branch 'master' into qtquick2

Conflicts:
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgcanvasitem.cpp

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Aaron Kennedy [Thu, 9 Jun 2011 05:23:12 +0000 (15:23 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoAutomatically set system if parent is a ParticleSystem
Alan Alpert [Thu, 9 Jun 2011 05:17:52 +0000 (15:17 +1000)]
Automatically set system if parent is a ParticleSystem

13 years agoRectify over-zealous script results.
Alan Alpert [Thu, 9 Jun 2011 05:10:45 +0000 (15:10 +1000)]
Rectify over-zealous script results.