konrad/qtdeclarative.git
13 years agoUpdate v8 to include ARM patches
Aaron Kennedy [Fri, 10 Jun 2011 02:22:04 +0000]
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]
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]
Use optimized QObject wrapper whenever it is possible

13 years agoMerge branch 'qtquick2' into v8
Aaron Kennedy [Thu, 9 Jun 2011 06:22:45 +0000]
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]
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]
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]
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]
Rectify over-zealous script results.

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

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

13 years agoMerge branch 'master' into qtquick2
Aaron Kennedy [Thu, 9 Jun 2011 04:45:59 +0000]
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]
Minor XXX fixups

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

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

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

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

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

13 years agoPort Canvas and Context2D to V8
Aaron Kennedy [Thu, 9 Jun 2011 02:35:34 +0000]
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]
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]
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]
Update Binding changes in "What's New"

13 years agoOptimized QDeclarativeScriptString constructor for QDeclarativeExpression.
Michael Brasser [Wed, 8 Jun 2011 03:18:35 +0000]
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]
Doc: Added missing license headers for documentation and examples.

13 years agoRemoved generated files.
David Boddie [Wed, 8 Jun 2011 07:43:02 +0000]
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]
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]
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]
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]
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]
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]
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]
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]
Allow methods to be changed by debugger

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

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

13 years agoEnter context before running bindings
Aaron Kennedy [Wed, 8 Jun 2011 00:16:17 +0000]
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]
Elaborate on the MouseArea changes

13 years agoFix usage of QT_SOURCE_TREE
Marius Storm-Olsen [Tue, 7 Jun 2011 18:26:39 +0000]
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]
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]
Use feature profile loading instead of direct inclusion.

13 years agoFixed clock_gettime() library dependency.
axis [Fri, 27 May 2011 12:55:06 +0000]
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]
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]
Implement ListModel in V8

13 years agoDispose of WorkerScripts in correct Isolate
Aaron Kennedy [Tue, 7 Jun 2011 06:34:04 +0000]
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]
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]
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]
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]
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]
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]
A better threaded renderer

13 years agoRemoved warning
Gunnar Sletta [Mon, 6 Jun 2011 05:45:22 +0000]
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]
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]
Fixed up command line options a bit

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

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

13 years agoInitial V8 integration
Aaron Kennedy [Wed, 11 May 2011 07:20:40 +0000]
Initial V8 integration

13 years agorewrite context2d with direct QtScript binding
Charles Yin [Mon, 30 May 2011 06:14:42 +0000]
rewrite context2d with direct QtScript binding

for better performance.

Change-Id: I740ad4cbb7446a838954a010b0e5f0b847ec4f53

13 years agoRevert some of "Make QMLViewer startup animation stop after a while"
Alan Alpert [Fri, 3 Jun 2011 01:19:44 +0000]
Revert some of "Make QMLViewer startup animation stop after a while"

This reverts most of commit c6e6a35aeb8794d68a3ca0c4e27a3a1181c066b5.

Only the startup.qml changes were meant to go in. The other stuff is an
experimental feature that was not supposed to be merged in.

Reviewed-by: Michael Brasser

13 years agoUpdate "What's New" with change to Binding.
Michael Brasser [Fri, 3 Jun 2011 00:04:16 +0000]
Update "What's New" with change to Binding.

13 years agoReplace QPerformanceTimer with QElapsedTimer.
Michael Brasser [Thu, 2 Jun 2011 23:50:04 +0000]
Replace QPerformanceTimer with QElapsedTimer.

QElapsedTimer has added a nsecsElapsed() function, so QPerformanceTimer
is no longer needed.

Reviewed-by: Charles Yin

13 years agoAdd docs and test for Binding changes.
Michael Brasser [Wed, 13 Apr 2011 01:39:58 +0000]
Add docs and test for Binding changes.

Change-Id: I6bce140bf80c3e0defd7603aecfb7f658520f4d3
Reviewed-by: Martin Jones

13 years agoRestore original binding when Binding's when clause becomes false.
Michael Brasser [Sun, 13 Mar 2011 23:45:58 +0000]
Restore original binding when Binding's when clause becomes false.

Change-Id: I7e2ba1f6e3cd1e049ec2666ab8191cb91acbfe50
Reviewed-by: Martin Jones

13 years agoMake Binding a value source.
Michael Brasser [Fri, 11 Mar 2011 05:28:52 +0000]
Make Binding a value source.

Change-Id: I1a9003f1e506c53e172bfae418f536ad0da2bf47
Reviewed-by: Martin Jones

13 years agoMake complex rich text works with the threaded renderer.
Yoann Lopes [Wed, 1 Jun 2011 14:18:37 +0000]
Make complex rich text works with the threaded renderer.

Painting must be done from the GUI thread.

13 years agoFix images not being rendered when embedded in a rich text.
Yoann Lopes [Wed, 1 Jun 2011 12:49:53 +0000]
Fix images not being rendered when embedded in a rich text.

In that case the whole text is cached in a QImage, but that cache was
not updated when the embedded image was finished to be loaded.

Depends on ac7dcaec90d7603cd4dd80cdb3dcbdc689f376c2.

Task-number: QTBUG-19428

13 years agoFix QDeclarativePixmap not setting its QPixmap.
Yoann Lopes [Wed, 1 Jun 2011 12:44:16 +0000]
Fix QDeclarativePixmap not setting its QPixmap.

When used with the scenegraph, it was only setting the texture but not
the pixmap.

13 years agoFix Text's underline, overline and strikeout properties for plain text.
Yoann Lopes [Wed, 1 Jun 2011 09:37:27 +0000]
Fix Text's underline, overline and strikeout properties for plain text.

13 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging
Martin Jones [Tue, 31 May 2011 22:53:40 +0000]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging

13 years agoSmall doc fix.
Martin Jones [Tue, 31 May 2011 22:52:10 +0000]
Small doc fix.

Change-Id: Id3720c9ad6d3dc459cf7b726a443cc1ac390e223

13 years agoAvoid recursive updates in QSGText.
Yoann Lopes [Tue, 31 May 2011 12:37:39 +0000]
Avoid recursive updates in QSGText.

13 years agoQDeclarative: fixed clean animation lists
Christiaan Janssen [Mon, 23 May 2011 14:44:29 +0000]
QDeclarative: fixed clean animation lists

Change-Id: I9dd8b4fcd3f04193410710981a511b9f69e5dc19

13 years agoDeclarativeObserver: Don't fade in the highlight edge
Thorbjørn Lindeijer [Thu, 26 May 2011 18:23:16 +0000]
DeclarativeObserver: Don't fade in the highlight edge

It feels more responsive when the highlight is immediately visible.

Change-Id: Ie3dd0693ecc38f33b001c86970b220b45b37fdfc
Reviewed-by: Kai Koehne
(cherry picked from commit 0b4e028ec294992df01430bdf978982835c7df5c)

13 years agoRenamed declarativeobserver plugin to qmldbg_inspector
Thorbjørn Lindeijer [Mon, 30 May 2011 10:51:45 +0000]
Renamed declarativeobserver plugin to qmldbg_inspector

Mainly since it's a good idea to prefix the plugin on Symbian, and at
the same time it's now consistency called 'inspector' rather than
'observer'.

Symbian .def files will need to be updated.

Change-Id: I43071331c8002f8844efd14105d01c730d97e946
Reviewed-by: Kai Koehne
(cherry picked from commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb)

13 years agoRemove more webkit dependency from qtdeclarative.
Martin Jones [Tue, 31 May 2011 08:05:10 +0000]
Remove more webkit dependency from qtdeclarative.

Change-Id: I75fd903e6a8160210652c2cec3c4636e908a9ade

13 years agoRemove the examples/declarative/demos copy.
Martin Jones [Tue, 31 May 2011 06:42:49 +0000]
Remove the examples/declarative/demos copy.

Not sure why it is here, but it shouldn't be.

Change-Id: I1a2f9cc994de13690bbc77d41005051e340291f7

13 years agoEnsure doc code snippet can be loaded by QML engine.
Martin Jones [Tue, 31 May 2011 06:18:30 +0000]
Ensure doc code snippet can be loaded by QML engine.

Change-Id: I2249a064a0c2afa3de1a9252ab4796af5bbeacc8

13 years agoRemove webbrowser demo from qtdeclarative module.
Martin Jones [Tue, 31 May 2011 06:15:30 +0000]
Remove webbrowser demo from qtdeclarative module.

qtdeclarative should not depend on webkit.

Change-Id: I82e3f49dbe710e408c1a74911787541a9ea9efa1

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative
Martin Jones [Tue, 31 May 2011 05:34:37 +0000]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative

Conflicts:
src/declarative/debugger/qpacketprotocol.cpp

Change-Id: I61f500a08ce73def34c093344bfdad44a6c9a6f1

13 years agoMerge branch 'qtquick2'
Martin Jones [Tue, 31 May 2011 05:25:44 +0000]
Merge branch 'qtquick2'

Conflicts:
demos/declarative/flickr/common/Progress.qml
demos/declarative/flickr/common/RssModel.qml
demos/declarative/flickr/common/ScrollBar.qml
demos/declarative/flickr/common/Slider.qml
demos/declarative/flickr/mobile/Button.qml
demos/declarative/flickr/mobile/GridDelegate.qml
demos/declarative/flickr/mobile/ImageDetails.qml
demos/declarative/flickr/mobile/ListDelegate.qml
demos/declarative/flickr/mobile/TitleBar.qml
demos/declarative/flickr/mobile/ToolBar.qml
demos/declarative/webbrowser/content/Button.qml
demos/declarative/webbrowser/content/FlickableWebView.qml
demos/declarative/webbrowser/content/Header.qml
demos/declarative/webbrowser/content/ScrollBar.qml
demos/declarative/webbrowser/content/UrlInput.qml
demos/declarative/webbrowser/webbrowser.qml
doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
examples/declarative/modelviews/webview/newwindows/qml/alerts.html
examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html
examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png
examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png
examples/declarative/modelviews/webview/newwindows/qml/newwindows.html
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/qml/qdeclarativecompiledbindings.cpp
src/declarative/qml/qdeclarativecompiledbindings_p.h
src/declarative/qml/qdeclarativedom.cpp
src/declarative/qml/qdeclarativedom_p.h
src/declarative/qml/qdeclarativedom_p_p.h
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/imports/particles/particles.cpp
tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png
tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png
tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png
tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png
tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png
tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp

Change-Id: I40df8a9403a58a6c03a0f1734f16a5cbed6c85ff

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
Qt Continuous Integration System [Tue, 31 May 2011 02:33:00 +0000]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  QmlDebugger: adding slots to items in Live Preview
  QmlDebugger: parsing packets iteratively in the communication protocol

13 years agoExport more VisualModel symbols
Alan Alpert [Tue, 31 May 2011 00:28:59 +0000]
Export more VisualModel symbols

13 years agofix shadow build error
Charles Yin [Mon, 30 May 2011 13:30:05 +0000]
fix shadow build error

Change-Id: I68c8edac98389c487c1ac09bb74d43fdeb85cdc3

13 years agoQmlDebugger: adding slots to items in Live Preview
Christiaan Janssen [Mon, 30 May 2011 12:59:47 +0000]
QmlDebugger: adding slots to items in Live Preview

Reviewed-by: Kai Koehne

(reapplied commit 89d9b83aa26db4f528250c3fe4716b81955c6929 from qtcreator)

13 years agoQmlDebugger: parsing packets iteratively in the communication protocol
Christiaan Janssen [Mon, 30 May 2011 12:56:19 +0000]
QmlDebugger: parsing packets iteratively in the communication protocol

Reviewed-by: Kai Koehne

(reapplied commit fea13a449c59690ae7b7f43aa64f50c0a290a2cf from qtcreator)

13 years agoCompile fix.
Kim Motoyoshi Kalland [Mon, 30 May 2011 11:41:10 +0000]
Compile fix.

13 years agoCompile.
Kim Motoyoshi Kalland [Mon, 30 May 2011 10:46:18 +0000]
Compile.

13 years agoqmlplugindump: Bump QtQuick.tooling version to 1.1.
Christian Kamm [Mon, 30 May 2011 08:20:29 +0000]
qmlplugindump: Bump QtQuick.tooling version to 1.1.

Mirrors a change to qmlplugindump in
qtcreator/715cee76a9e46efb7f8245004aaa8a1c47b1618d

Reviewed-by: Kai Koehne
(cherry picked from commit 10f16bc55b9e5535bc3353260f97a32e18d70cf1)

13 years agoqmlplugindump: Dump revision property.
Christian Kamm [Mon, 30 May 2011 07:24:20 +0000]
qmlplugindump: Dump revision property.

Mirrors a change to qmldump in
qt-creator/6e3274240077fc356a37d3de735b3b2da9654d2e

Reviewed-by: Roberto Raggi
(cherry picked from commit b0392d398e2f28682cdce6e85546d38a838440f7)

13 years agoUpdate SG items with recent GV item changes.
Martin Jones [Mon, 30 May 2011 06:35:52 +0000]
Update SG items with recent GV item changes.

Change-Id: Ib9cadea91ab3717bee0caf2071102a100e81969d

13 years agoListView segmentation fault when setting highlight to null
Martin Jones [Mon, 30 May 2011 05:26:06 +0000]
ListView segmentation fault when setting highlight to null

Setting view highlight to null due to focus change caused a crash
since graphicsview accessed the highlight item after it had been
deleted.  Remove highlight item from scene and deleteLater(),
as is done for delegates.

Change-Id: I5bfd59095aca90d3adca805bc4f61c92c192ee1b
Task-number: QTBUG-19509
Reviewed-by: Bea Lam
(cherry picked from commit b9d5cb9334e7d9da71af169802a01f8d344151a7)

13 years agoQDeclarativeMouseArea: block context menu events
Caio Marcelo de Oliveira Filho [Fri, 13 May 2011 07:01:28 +0000]
QDeclarativeMouseArea: block context menu events

If the MouseArea accepts the same button used to trigger a context
menu event, it should not let the event to be delivered to item
behind.

This is important for items that do implement contextMenuEvent(), like
QDeclarativeWebView. When there's a mouse area on top of this item and
that accepts the right click (in Linux), the event was still being
delivered and the WebView menu was incorrectly appearing.

QtWebKit bug https://bugs.webkit.org/show_bug.cgi?id=56526 documents this
problem.

Change-Id: I386fac6c96f47b8616e2eeb7e5f97043ba418980
Merge-request: 1185
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherry picked from commit 80db0a1e59658f9e445219fc48d9236a79edca72)

13 years agoListViews loses items if all visible items are removed.
Martin Jones [Fri, 13 May 2011 05:28:30 +0000]
ListViews loses items if all visible items are removed.

Occurs when at end of list and all visible items are removed in
multiple steps, without entering the event loop.
We were not updating visibleIndex if there were no visible items
when handling itemsRemoved().
Also avoid skipping items in refill if there are no valid visible
items for reference.

Change-Id: I2ff58fb191f6b053f33d5446220d597eb15b66d4
Task-number: QTBUG-19198
Reviewed-by: Bea Lam
(cherry picked from commit 576d577438f1193bbc934e904b809d5b23b8d54e)

13 years agoViews do not notify count changes properly
Martin Jones [Thu, 5 May 2011 04:18:28 +0000]
Views do not notify count changes properly

The views don't have a valid count until both a model and a delegate
are provided.  But, countChanged() is not called when a delegate is
set after the model, so bindings to count were not evaluated.  Also
test that count is updated for insertion/removal

Change-Id: Ic82039a624c02f0bdb2862ac7a6e215df75bb314
Task-number: QTBUG-19037
Reviewed-by: Bea Lam
(cherry picked from commit 4fbcb6a531bf424a8dbbbd0ca2947d9e15118885)

13 years agoUninitialized memory is compared.
Martin Jones [Thu, 5 May 2011 03:24:32 +0000]
Uninitialized memory is compared.

Memory is allocated and used without first clearing it.  At
the least this annoys valgrind, but also has potential for real
problems.

Change-Id: Icf3fd39f44ee0481dd732510e7f8b3ad6cef477d
Task-number: QTBUG-15187
Reviewed-by: Aaron Kennedy
(cherry picked from commit 95aa4e4f9b82c3652ffc93310b190db869d491df)

13 years agoClear the root index when the model is reset.
Girish Ramakrishnan [Wed, 27 Apr 2011 05:53:43 +0000]
Clear the root index when the model is reset.

Task-number: QTBUG-18839

Change-Id: I46608d7481d820fa74a9be60df1e018e70a761c6
Merge-request: 2598
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherry picked from commit f6b7ce204ee88be0fedb4cfcff382f208fa4ed33)

13 years agofix qmltest unit test failures
Charles Yin [Mon, 30 May 2011 05:24:49 +0000]
fix qmltest unit test failures

Change-Id: I489d1559411f5804f11f4601e34011bc38742b02

13 years agocopy other .qml .js files during build time
Charles Yin [Mon, 30 May 2011 03:50:46 +0000]
copy other .qml .js files during build time

Change-Id: I08db54c7cd5d2ae7bbad28440cc36f6332a190c9

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 30 May 2011 02:11:53 +0000]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoExport QSGVisualItemModel
Alan Alpert [Mon, 30 May 2011 02:11:24 +0000]
Export QSGVisualItemModel

Necessary for DataParticles.

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Martin Jones [Mon, 30 May 2011 01:42:04 +0000]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoqmlvisual is broken and unmaintained. Remove it.
Martin Jones [Mon, 30 May 2011 01:23:22 +0000]
qmlvisual is broken and unmaintained.  Remove it.

Change-Id: I9d522d3db81586da8f24be2b3becfdbf2968d933

13 years agoUpdate TextBallons .pro file
Alan Alpert [Mon, 30 May 2011 00:46:31 +0000]
Update TextBallons .pro file

Botched the previous alteration