profile/ivi/qtdeclarative.git
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 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 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 agoRemove annoying warning
Gunnar Sletta [Wed, 15 Jun 2011 09:32:49 +0000 (11:32 +0200)]
Remove annoying warning

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 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 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 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.

13 years agoMerge branch 'threaded3'
Gunnar Sletta [Thu, 9 Jun 2011 05:08:36 +0000 (07:08 +0200)]
Merge branch 'threaded3'

13 years agoIntroduced simple material
Gunnar Sletta [Tue, 7 Jun 2011 11:58:39 +0000 (13:58 +0200)]
Introduced simple material

13 years agoMerge branch 'master' into qtquick2
Aaron Kennedy [Thu, 9 Jun 2011 04:45:59 +0000 (14:45 +1000)]
Merge branch 'master' into qtquick2

Conflicts:
src/declarative/qml/qdeclarativeengine.cpp

13 years agoMinor XXX fixups
Aaron Kennedy [Thu, 9 Jun 2011 04:40:44 +0000 (14:40 +1000)]
Minor XXX fixups

13 years agoRemove QtScript code from QDeclarativeExpression
Aaron Kennedy [Thu, 9 Jun 2011 03:03:17 +0000 (13:03 +1000)]
Remove QtScript code from QDeclarativeExpression

13 years agoFix initialization bugs in d9d952d3c0475b1e7f7b8df2b062f85f24387aca
Aaron Kennedy [Thu, 9 Jun 2011 02:58:05 +0000 (12:58 +1000)]
Fix initialization bugs in d9d952d3c0475b1e7f7b8df2b062f85f24387aca

13 years agoRemove QtScript code from QDeclarativeEngine
Aaron Kennedy [Thu, 9 Jun 2011 02:52:17 +0000 (12:52 +1000)]
Remove QtScript code from QDeclarativeEngine

13 years agoRemove QtScript code from XmlListModel
Aaron Kennedy [Thu, 9 Jun 2011 02:44:09 +0000 (12:44 +1000)]
Remove QtScript code from XmlListModel

13 years agoRemove leftover QtScript code from ListModel
Aaron Kennedy [Thu, 9 Jun 2011 02:43:15 +0000 (12:43 +1000)]
Remove leftover QtScript code from ListModel

13 years agoPort Canvas and Context2D to V8
Aaron Kennedy [Thu, 9 Jun 2011 02:35:34 +0000 (12:35 +1000)]
Port Canvas and Context2D to V8

13 years agoAllow extensions to register with the QV8Engine
Aaron Kennedy [Thu, 9 Jun 2011 02:34:59 +0000 (12:34 +1000)]
Allow extensions to register with the QV8Engine

This means we don't have to modify the QV8Engine class every time
a new JS API is added.

13 years agoRemove clock_gettime() library dependency.
Michael Brasser [Thu, 9 Jun 2011 02:10:03 +0000 (12:10 +1000)]
Remove clock_gettime() library dependency.

Should have been removed as part of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e.

13 years agoUpdate Binding changes in "What's New"
Michael Brasser [Thu, 9 Jun 2011 00:21:34 +0000 (10:21 +1000)]
Update Binding changes in "What's New"

13 years agoOptimized QDeclarativeScriptString constructor for QDeclarativeExpression.
Michael Brasser [Wed, 8 Jun 2011 03:18:35 +0000 (13:18 +1000)]
Optimized QDeclarativeScriptString constructor for QDeclarativeExpression.

When the compiler sees a script string, it will attempt to rewrite it
and store the id for the rewrite in the script string. We can then
create a QDeclarativeExpression using the id, which saves us a rewrite
at runtime.

Reviewed-by: Aaron Kennedy
13 years agoDoc: Added missing license headers for documentation and examples.
David Boddie [Wed, 8 Jun 2011 15:42:42 +0000 (17:42 +0200)]
Doc: Added missing license headers for documentation and examples.

13 years agoRemoved generated files.
David Boddie [Wed, 8 Jun 2011 07:43:02 +0000 (09:43 +0200)]
Removed generated files.

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

13 years agoImmense Particles Refactor Part D
Alan Alpert [Wed, 8 Jun 2011 07:55:41 +0000 (17:55 +1000)]
Immense Particles Refactor Part D

Changed the names of several properties:
FollowEmitter:
emissionShape->emitShape
emissionHeight->emitHeight
emissionWidth->emitWidth
Emitter:
particlesPerSecond->emitRate
particleDuration->lifeSpan
particleDurationVariation->lifeSpanVariation
maxParticles->emitCap
particleSize->size
particleEndSize->endSize
particleSizeVariation->sizeVariation
ImageParticle:
image->source

And stopped being silly in the example launcher.

13 years agoDon't crash if GL context initialization failed
Aaron Kennedy [Wed, 8 Jun 2011 06:59:33 +0000 (16:59 +1000)]
Don't crash if GL context initialization failed

13 years agoWake render thread when doing paint() and grab() as in resize()
Gunnar Sletta [Wed, 8 Jun 2011 05:06:25 +0000 (07:06 +0200)]
Wake render thread when doing paint() and grab() as in resize()

13 years agoCreate a copy of the imported script array handles
Aaron Kennedy [Wed, 8 Jun 2011 04:33:20 +0000 (14:33 +1000)]
Create a copy of the imported script array handles

This prevents the handles from being double Dispose()'d.

13 years agoImplement global handle tracking
Aaron Kennedy [Wed, 8 Jun 2011 04:32:39 +0000 (14:32 +1000)]
Implement global handle tracking

This makes it easier to track down handles that have been double
Dispose()'d.  See qv8engine_p.h for details.

13 years agoImmense Particles Refactor Part C
Alan Alpert [Wed, 8 Jun 2011 03:19:56 +0000 (13:19 +1000)]
Immense Particles Refactor Part C

Demos work again (also, the examples I missed).

Added an example launcher for particles.

13 years agoAllow methods to be changed by debugger
Aaron Kennedy [Wed, 8 Jun 2011 00:56:00 +0000 (10:56 +1000)]
Allow methods to be changed by debugger

13 years agoImplement gc() method
Aaron Kennedy [Wed, 8 Jun 2011 00:40:14 +0000 (10:40 +1000)]
Implement gc() method

13 years agoUpdate error strings to match V8
Aaron Kennedy [Wed, 8 Jun 2011 00:21:50 +0000 (10:21 +1000)]
Update error strings to match V8

13 years agoEnter context before running bindings
Aaron Kennedy [Wed, 8 Jun 2011 00:16:17 +0000 (10:16 +1000)]
Enter context before running bindings

Although not strictly necessary to run the binding function, the
subsequent calls to toVariant() might execute code and thus require
a context.

13 years agoElaborate on the MouseArea changes
Alan Alpert [Tue, 7 Jun 2011 22:10:13 +0000 (08:10 +1000)]
Elaborate on the MouseArea changes

13 years agoFix usage of QT_SOURCE_TREE
Marius Storm-Olsen [Tue, 7 Jun 2011 18:26:39 +0000 (13:26 -0500)]
Fix usage of QT_SOURCE_TREE

Functionality has been moved into qt_example.prf

13 years agoFix missing include->load conversion of qbase.pri
Marius Storm-Olsen [Tue, 7 Jun 2011 13:28:02 +0000 (08:28 -0500)]
Fix missing include->load conversion of qbase.pri

13 years agoUse feature profile loading instead of direct inclusion.
axis [Mon, 30 May 2011 14:11:05 +0000 (16:11 +0200)]
Use feature profile loading instead of direct inclusion.

13 years agoFixed clock_gettime() library dependency.
axis [Fri, 27 May 2011 12:55:06 +0000 (14:55 +0200)]
Fixed clock_gettime() library dependency.

The old construct doesn't work if the QtBase source is unavailable.

Reviewed-by: Marius Storm-Olsen
13 years agoImmense Particles Refactor Part B
Alan Alpert [Tue, 7 Jun 2011 09:39:38 +0000 (19:39 +1000)]
Immense Particles Refactor Part B

Examples work again. Also augmented Wander and PointAttractor with
physics modes.

13 years agoImplement ListModel in V8
Aaron Kennedy [Tue, 7 Jun 2011 06:54:09 +0000 (16:54 +1000)]
Implement ListModel in V8

13 years agoDispose of WorkerScripts in correct Isolate
Aaron Kennedy [Tue, 7 Jun 2011 06:34:04 +0000 (16:34 +1000)]
Dispose of WorkerScripts in correct Isolate

We were disposing them in the main thread isolate which caused
corruption of the v8 heap.  Specifically this showed in asserting
allocations of persistent handles.

13 years agoAllow the same QObject to be used in multiple QDeclarativeEngines
Aaron Kennedy [Tue, 7 Jun 2011 03:19:27 +0000 (13:19 +1000)]
Allow the same QObject to be used in multiple QDeclarativeEngines

13 years agoImmense Particles Refactor Part A
Alan Alpert [Tue, 7 Jun 2011 05:12:53 +0000 (15:12 +1000)]
Immense Particles Refactor Part A

Qt.labs.particles 2.0 moved to QtQuick.Particles 2.0. All C++ classes
changed names, some renaming of QML types.

Also adds CustomParticle.

13 years agoFix docs on caching for images loaded by image providers
Bea Lam [Tue, 7 Jun 2011 01:34:57 +0000 (11:34 +1000)]
Fix docs on caching for images loaded by image providers

Also add docs for 'source' and 'asynchronous' properties for
AnimatedImage.

Task-number: QTBUG-19504
Change-Id: Iec72dc7630308a94c37d00c6b008b5949c6fccd4
Reviewed-by: Martin Jones
(cherry picked from commit 7602be09663d37f01cfd640a7f1be959ce4317b7)

13 years agoMerge branch 'master' into v8
Michael Brasser [Tue, 7 Jun 2011 00:15:38 +0000 (10:15 +1000)]
Merge branch 'master' into v8

Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/qml/qdeclarativecontextscriptclass.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeengine_p.h
src/declarative/qml/qdeclarativeglobalscriptclass.cpp
src/declarative/qml/qdeclarativeinclude.cpp
src/declarative/qml/qdeclarativelistscriptclass.cpp
src/declarative/qml/qdeclarativeobjectscriptclass.cpp
src/declarative/qml/qdeclarativeobjectscriptclass_p.h
src/declarative/qml/qdeclarativetypenamescriptclass.cpp
src/declarative/qml/qdeclarativevaluetypescriptclass.cpp

13 years agoFix crash for prematurely deleted QSGItemPrivate::itemNodeInstance
Gabriel de Dietrich [Wed, 1 Jun 2011 13:11:34 +0000 (15:11 +0200)]
Fix crash for prematurely deleted QSGItemPrivate::itemNodeInstance

The OwnedByParent flag was set whereas it should had been cleared
right after creating QSGItemPrivate::itemNodeInstance.

Reviewed-by: Kim
13 years agoA better threaded renderer
Gunnar Sletta [Mon, 6 Jun 2011 06:05:56 +0000 (08:05 +0200)]
A better threaded renderer

13 years agoRemoved warning
Gunnar Sletta [Mon, 6 Jun 2011 05:45:22 +0000 (07:45 +0200)]
Removed warning

13 years agoDon't fetch a context that is never to be used
Gunnar Sletta [Mon, 6 Jun 2011 05:44:41 +0000 (07:44 +0200)]
Don't fetch a context that is never to be used

13 years agoFixed up command line options a bit
Gunnar Sletta [Mon, 6 Jun 2011 05:43:51 +0000 (07:43 +0200)]
Fixed up command line options a bit

13 years agoMerge branch 'master' into qtquick2
Alan Alpert [Mon, 6 Jun 2011 05:19:50 +0000 (15:19 +1000)]
Merge branch 'master' into qtquick2

Conflicts:
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/qml/qdeclarativeengine.cpp