Gunnar Sletta [Fri, 10 Jun 2011 11:40:48 +0000 (13:40 +0200)]
Disable vsync animations by default
Change-Id: Ia614915ddb96f5c51e9883885479f1269ab361ed
Aaron Kennedy [Fri, 10 Jun 2011 03:46:44 +0000 (13:46 +1000)]
Add JavaScript benchmark
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)
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
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.
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
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
Gunnar Sletta [Thu, 9 Jun 2011 07:37:42 +0000 (09:37 +0200)]
Merge branch 'master' into qtquick2
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.
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
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
Alan Alpert [Thu, 9 Jun 2011 05:17:52 +0000 (15:17 +1000)]
Automatically set system if parent is a ParticleSystem
Alan Alpert [Thu, 9 Jun 2011 05:10:45 +0000 (15:10 +1000)]
Rectify over-zealous script results.
Gunnar Sletta [Thu, 9 Jun 2011 05:08:36 +0000 (07:08 +0200)]
Merge branch 'threaded3'
Gunnar Sletta [Tue, 7 Jun 2011 11:58:39 +0000 (13:58 +0200)]
Introduced simple material
Aaron Kennedy [Thu, 9 Jun 2011 04:45:59 +0000 (14:45 +1000)]
Merge branch 'master' into qtquick2
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
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.
Michael Brasser [Thu, 9 Jun 2011 00:21:34 +0000 (10:21 +1000)]
Update Binding changes in "What's New"
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
David Boddie [Wed, 8 Jun 2011 15:42:42 +0000 (17:42 +0200)]
Doc: Added missing license headers for documentation and examples.
David Boddie [Wed, 8 Jun 2011 07:43:02 +0000 (09:43 +0200)]
Removed generated files.
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
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.
Aaron Kennedy [Wed, 8 Jun 2011 06:59:33 +0000 (16:59 +1000)]
Don't crash if GL context initialization failed
Gunnar Sletta [Wed, 8 Jun 2011 05:06:25 +0000 (07:06 +0200)]
Wake render thread when doing paint() and grab() as in resize()
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.
Alan Alpert [Tue, 7 Jun 2011 22:10:13 +0000 (08:10 +1000)]
Elaborate on the MouseArea changes
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
Marius Storm-Olsen [Tue, 7 Jun 2011 13:28:02 +0000 (08:28 -0500)]
Fix missing include->load conversion of qbase.pri
axis [Mon, 30 May 2011 14:11:05 +0000 (16:11 +0200)]
Use feature profile loading instead of direct inclusion.
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
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.
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.
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)
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
Gunnar Sletta [Mon, 6 Jun 2011 06:05:56 +0000 (08:05 +0200)]
A better threaded renderer
Gunnar Sletta [Mon, 6 Jun 2011 05:45:22 +0000 (07:45 +0200)]
Removed warning
Gunnar Sletta [Mon, 6 Jun 2011 05:44:41 +0000 (07:44 +0200)]
Don't fetch a context that is never to be used
Gunnar Sletta [Mon, 6 Jun 2011 05:43:51 +0000 (07:43 +0200)]
Fixed up command line options a bit
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
Charles Yin [Mon, 30 May 2011 06:14:42 +0000 (16:14 +1000)]
rewrite context2d with direct QtScript binding
for better performance.
Change-Id: I740ad4cbb7446a838954a010b0e5f0b847ec4f53
Alan Alpert [Fri, 3 Jun 2011 01:19:44 +0000 (11:19 +1000)]
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
Michael Brasser [Fri, 3 Jun 2011 00:04:16 +0000 (10:04 +1000)]
Update "What's New" with change to Binding.
Michael Brasser [Thu, 2 Jun 2011 23:50:04 +0000 (09:50 +1000)]
Replace QPerformanceTimer with QElapsedTimer.
QElapsedTimer has added a nsecsElapsed() function, so QPerformanceTimer
is no longer needed.
Reviewed-by: Charles Yin
Michael Brasser [Wed, 13 Apr 2011 01:39:58 +0000 (11:39 +1000)]
Add docs and test for Binding changes.
Change-Id: I6bce140bf80c3e0defd7603aecfb7f658520f4d3
Reviewed-by: Martin Jones
Michael Brasser [Sun, 13 Mar 2011 23:45:58 +0000 (09:45 +1000)]
Restore original binding when Binding's when clause becomes false.
Change-Id: I7e2ba1f6e3cd1e049ec2666ab8191cb91acbfe50
Reviewed-by: Martin Jones
Michael Brasser [Fri, 11 Mar 2011 05:28:52 +0000 (15:28 +1000)]
Make Binding a value source.
Change-Id: I1a9003f1e506c53e172bfae418f536ad0da2bf47
Reviewed-by: Martin Jones
Yoann Lopes [Wed, 1 Jun 2011 14:18:37 +0000 (16:18 +0200)]
Make complex rich text works with the threaded renderer.
Painting must be done from the GUI thread.
Yoann Lopes [Wed, 1 Jun 2011 12:49:53 +0000 (14:49 +0200)]
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
Yoann Lopes [Wed, 1 Jun 2011 12:44:16 +0000 (14:44 +0200)]
Fix QDeclarativePixmap not setting its QPixmap.
When used with the scenegraph, it was only setting the texture but not
the pixmap.
Yoann Lopes [Wed, 1 Jun 2011 09:37:27 +0000 (11:37 +0200)]
Fix Text's underline, overline and strikeout properties for plain text.
Martin Jones [Tue, 31 May 2011 22:53:40 +0000 (08:53 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging
Martin Jones [Tue, 31 May 2011 22:52:10 +0000 (08:52 +1000)]
Small doc fix.
Change-Id: Id3720c9ad6d3dc459cf7b726a443cc1ac390e223
Yoann Lopes [Tue, 31 May 2011 12:37:39 +0000 (14:37 +0200)]
Avoid recursive updates in QSGText.
Christiaan Janssen [Mon, 23 May 2011 14:44:29 +0000 (16:44 +0200)]
QDeclarative: fixed clean animation lists
Change-Id: I9dd8b4fcd3f04193410710981a511b9f69e5dc19
Thorbjørn Lindeijer [Thu, 26 May 2011 18:23:16 +0000 (20:23 +0200)]
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)
Thorbjørn Lindeijer [Mon, 30 May 2011 10:51:45 +0000 (12:51 +0200)]
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)
Martin Jones [Tue, 31 May 2011 08:05:10 +0000 (18:05 +1000)]
Remove more webkit dependency from qtdeclarative.
Change-Id: I75fd903e6a8160210652c2cec3c4636e908a9ade
Martin Jones [Tue, 31 May 2011 06:42:49 +0000 (16:42 +1000)]
Remove the examples/declarative/demos copy.
Not sure why it is here, but it shouldn't be.
Change-Id: I1a2f9cc994de13690bbc77d41005051e340291f7
Martin Jones [Tue, 31 May 2011 06:18:30 +0000 (16:18 +1000)]
Ensure doc code snippet can be loaded by QML engine.
Change-Id: I2249a064a0c2afa3de1a9252ab4796af5bbeacc8
Martin Jones [Tue, 31 May 2011 06:15:30 +0000 (16:15 +1000)]
Remove webbrowser demo from qtdeclarative module.
qtdeclarative should not depend on webkit.
Change-Id: I82e3f49dbe710e408c1a74911787541a9ea9efa1
Martin Jones [Tue, 31 May 2011 05:34:37 +0000 (15:34 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative
Conflicts:
src/declarative/debugger/qpacketprotocol.cpp
Change-Id: I61f500a08ce73def34c093344bfdad44a6c9a6f1
Martin Jones [Tue, 31 May 2011 05:25:44 +0000 (15:25 +1000)]
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
Qt Continuous Integration System [Tue, 31 May 2011 02:33:00 +0000 (12:33 +1000)]
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
Alan Alpert [Tue, 31 May 2011 00:28:59 +0000 (10:28 +1000)]
Export more VisualModel symbols
Charles Yin [Mon, 30 May 2011 13:30:05 +0000 (23:30 +1000)]
fix shadow build error
Change-Id: I68c8edac98389c487c1ac09bb74d43fdeb85cdc3
Christiaan Janssen [Mon, 30 May 2011 12:59:47 +0000 (14:59 +0200)]
QmlDebugger: adding slots to items in Live Preview
Reviewed-by: Kai Koehne
(reapplied commit
89d9b83aa26db4f528250c3fe4716b81955c6929 from qtcreator)
Christiaan Janssen [Mon, 30 May 2011 12:56:19 +0000 (14:56 +0200)]
QmlDebugger: parsing packets iteratively in the communication protocol
Reviewed-by: Kai Koehne
(reapplied commit
fea13a449c59690ae7b7f43aa64f50c0a290a2cf from qtcreator)
Kim Motoyoshi Kalland [Mon, 30 May 2011 11:41:10 +0000 (13:41 +0200)]
Compile fix.
Kim Motoyoshi Kalland [Mon, 30 May 2011 10:46:18 +0000 (12:46 +0200)]
Compile.
Christian Kamm [Mon, 30 May 2011 08:20:29 +0000 (10:20 +0200)]
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)
Christian Kamm [Mon, 30 May 2011 07:24:20 +0000 (09:24 +0200)]
qmlplugindump: Dump revision property.
Mirrors a change to qmldump in
qt-creator/
6e3274240077fc356a37d3de735b3b2da9654d2e
Reviewed-by: Roberto Raggi
(cherry picked from commit
b0392d398e2f28682cdce6e85546d38a838440f7)
Martin Jones [Mon, 30 May 2011 06:35:52 +0000 (16:35 +1000)]
Update SG items with recent GV item changes.
Change-Id: Ib9cadea91ab3717bee0caf2071102a100e81969d
Martin Jones [Mon, 30 May 2011 05:26:06 +0000 (15:26 +1000)]
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)
Caio Marcelo de Oliveira Filho [Fri, 13 May 2011 07:01:28 +0000 (17:01 +1000)]
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)
Martin Jones [Fri, 13 May 2011 05:28:30 +0000 (15:28 +1000)]
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)
Martin Jones [Thu, 5 May 2011 04:18:28 +0000 (14:18 +1000)]
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)
Martin Jones [Thu, 5 May 2011 03:24:32 +0000 (13:24 +1000)]
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)
Girish Ramakrishnan [Wed, 27 Apr 2011 05:53:43 +0000 (15:53 +1000)]
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)
Charles Yin [Mon, 30 May 2011 05:24:49 +0000 (15:24 +1000)]
fix qmltest unit test failures
Change-Id: I489d1559411f5804f11f4601e34011bc38742b02
Charles Yin [Mon, 30 May 2011 03:50:46 +0000 (13:50 +1000)]
copy other .qml .js files during build time
Change-Id: I08db54c7cd5d2ae7bbad28440cc36f6332a190c9
Alan Alpert [Mon, 30 May 2011 02:11:53 +0000 (12:11 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 30 May 2011 02:11:24 +0000 (12:11 +1000)]
Export QSGVisualItemModel
Necessary for DataParticles.
Martin Jones [Mon, 30 May 2011 01:42:04 +0000 (11:42 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Martin Jones [Mon, 30 May 2011 01:23:22 +0000 (11:23 +1000)]
qmlvisual is broken and unmaintained. Remove it.
Change-Id: I9d522d3db81586da8f24be2b3becfdbf2968d933
Alan Alpert [Mon, 30 May 2011 00:46:31 +0000 (10:46 +1000)]
Update TextBallons .pro file
Botched the previous alteration
Charles Yin [Sun, 29 May 2011 23:44:27 +0000 (09:44 +1000)]
fix typos
Change-Id: Iff14f7378bf8fa063bd6096a8662d47320564af6
Martin Jones [Sun, 29 May 2011 23:40:57 +0000 (09:40 +1000)]
Fix typo.
Change-Id: Ide770bf31258b84b48ee1f588707c3415d662ccb
Charles Yin [Sun, 29 May 2011 23:40:45 +0000 (09:40 +1000)]
fix the qmltestrunner building errors
Change-Id: Ib544544615d8aa96d2e5af8c82766472e1ed4018
Qt Continuous Integration System [Fri, 27 May 2011 15:04:00 +0000 (01:04 +1000)]
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: removing slots in Live Preview
QmlDebugger: adding slots to items in Live Preview
Christiaan Janssen [Fri, 29 Apr 2011 13:54:59 +0000 (15:54 +0200)]
QmlDebugger: removing slots in Live Preview
Reviewed-by: Kai Koehne
(cherry picked from commit
582be247290fd015798b3d84d692c0236dbff4e1)
Christiaan Janssen [Fri, 29 Apr 2011 13:33:11 +0000 (15:33 +0200)]
QmlDebugger: adding slots to items in Live Preview
Reviewed-by: Kai Koehne
(cherry picked from commit
1f0f8a1b15fa4efa58feb2799614afc8bf0bd6e3)
Qt Continuous Integration System [Fri, 27 May 2011 13:43:25 +0000 (23:43 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
DeclarativeObserver: Fixed duplicates in item selection
DeclarativeObserver: Removed the SubcomponentEditorTool
Pass QList as const reference when possible
Fixed crashes in Observer mode related to infinite bounding rects
Thorbjørn Lindeijer [Wed, 25 May 2011 11:42:48 +0000 (13:42 +0200)]
DeclarativeObserver: Fixed duplicates in item selection
Only add items to the current selection that aren't already part of it.
Also removed checking item for null, since it doesn't make sense to
include null pointers in the list of items to select.
Task-number: QTCREATORBUG-3426
Change-Id: I5a365570f87f72665b3382d05ca9937f56e8956b
Reviewed-by: Christiaan Janssen
(cherry picked from commit
f75fda0365a4e4bf1f26dedc40d96d37a2599174)
Thorbjørn Lindeijer [Tue, 24 May 2011 09:22:29 +0000 (11:22 +0200)]
DeclarativeObserver: Removed the SubcomponentEditorTool
This tool made selecting items in your QML app more complicated than
necessary. Now, left-click will always just select the top-most item
under the mouse and right-click will allow you to select any of the
items below.
Also, the highlighted bounding rect now always applies to just one
item, instead of also including the children bounding rect.
Reviewed-by: Kai Koehne
Change-Id: I17b5ab397d951fd68711590469ca6e723a9cb0e6
(cherry picked from commit
73060143c30d38ea99e6d7a77ff81c94f58899d7)
Thorbjørn Lindeijer [Tue, 17 May 2011 09:23:10 +0000 (11:23 +0200)]
Pass QList as const reference when possible
Avoids some reference counting.
Reviewed-by: Kai Koehne
Change-Id: I4de83aa4df6833fa2287ac1854bbb0052d15cee9
(cherry picked from commit
bdd8f188ac352c99ee218318a59089f387a31d60)
Thorbjørn Lindeijer [Tue, 17 May 2011 10:12:52 +0000 (12:12 +0200)]
Fixed crashes in Observer mode related to infinite bounding rects
Bug fixed by avoiding uniting or subtracting QPolygonF with potentially
infinite coordinates.
The LiveSelectionIndicator now uses a QGraphicsRectItem rather than a
QGraphicsPolygonItem and displays only the boundaries of selected
objects, not including their children.
The SubcomponentMaskLayerItem now works with rectangles and uses a
QRegion to determine the area around the current context, converting
this to a polygon only as a last step.
Reviewed-by: Kai Koehne
Task-number: QTCREATORBUG-4559
Change-Id: I266f5387fa67017fc50215282a95b4ee6498be6d
(cherry picked from commit
d03065da2999b8539d8c5160b58d56dd94373d6f)
Martin Jones [Fri, 27 May 2011 06:55:30 +0000 (16:55 +1000)]
Mention that positioners may conflict with anchors.
Change-Id: I8c89abcc6dd18915dca0eb9643c2376b2d128a29
Martin Jones [Fri, 27 May 2011 06:31:50 +0000 (16:31 +1000)]
Work around remaining 'make check' failures.
Change-Id: Ie4480d4f05f5d784eb277fa2be6e502da00524f8
Alan Alpert [Fri, 27 May 2011 04:13:49 +0000 (14:13 +1000)]
Make textballon example follow convention
Currently, the qml examples autotest works on a set of conventions
defined in its source code to determine which tests to run.
projects / profile / ivi / qtdeclarative.git / log