profile/ivi/qtdeclarative.git
13 years agoUpdate sync.profile dependencies to new syntax
Alan Alpert [Tue, 5 Jul 2011 10:38:46 +0000 (20:38 +1000)]
Update sync.profile dependencies to new syntax

%dependencies now has a simpler format of gitmodule => gitref instead of
using qt modules and keywords.

Change-Id: I8961a7f918b44176f55852de57d2effae016ebaa
Reviewed-on: http://codereview.qt.nokia.com/1159
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMove the demos to the examples folder.
Casper van Donderen [Mon, 4 Jul 2011 10:11:38 +0000 (12:11 +0200)]
Move the demos to the examples folder.

Change-Id: I094383099bf116357a3bb6eed0052d6d14408558
Reviewed-on: http://codereview.qt.nokia.com/1059
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
13 years agoUse QWheelEvent instead of QGraphicsSceneWheelEvent
Lars Knoll [Thu, 30 Jun 2011 08:53:50 +0000 (10:53 +0200)]
Use QWheelEvent instead of QGraphicsSceneWheelEvent

Since WheelEvent is not floating point based, we can
use it instead of the graphics scene event.

Change-Id: Ifa8411ca9c3a986ea311c8741f60213637b7c6ae
Reviewed-on: http://codereview.qt.nokia.com/1140
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoFix QSGBorderImage autotests
Yann Bodson [Wed, 6 Jul 2011 04:32:37 +0000 (14:32 +1000)]
Fix QSGBorderImage autotests

Change-Id: I6dd87232fc3d12a0ea3b8c25932d2ca01879fb3b
Reviewed-on: http://codereview.qt.nokia.com/1196
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
13 years agoFix QSGImage autotests
Yann Bodson [Wed, 6 Jul 2011 03:39:23 +0000 (13:39 +1000)]
Fix QSGImage autotests

Change-Id: I05b7bd4ad98c952ef4d536b987e6afd589a729fb
Reviewed-on: http://codereview.qt.nokia.com/1194
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
13 years agoqmlplugindump: Update qmltypes file format documentation.
Christian Kamm [Tue, 5 Jul 2011 11:48:03 +0000 (13:48 +0200)]
qmlplugindump: Update qmltypes file format documentation.

(cherry picked from commit bdae42967cd7fa9eb0182e1f25c1e743f35835f7)
Change-Id: Ia83eb42ad11f937b2977a53ee0f89c2e1b157278
Reviewed-on: http://codereview.qt.nokia.com/1164
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoSquashed Particle System Stateful Rewrite
Alan Alpert [Mon, 4 Jul 2011 08:15:28 +0000 (18:15 +1000)]
Squashed Particle System Stateful Rewrite

Add TargetAffector
Fix for ParticlePainter offsets
Adds a particleStates property to ParticleSystem
Augment SpriteGoal to change system states as well
Also add 'collidingParticles' list to affector.
Particle Stochastic States Now actually working, and you can put
emitters, affectors and painters inside their targeted state.
Fireworks example uses states instead of delegates.
Replaced the delegate example with a text thing.
The examples launcher now also contains all the custom examples.
Adds CumulativeDirection and working null Affector (for affected
signal).
Add spaces after all flow control keywords.

Change-Id: I77b7e3044a9800dbfff6db833914d63127602cf5
Reviewed-on: http://codereview.qt.nokia.com/968
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoAvoid crash on exit
Alan Alpert [Mon, 4 Jul 2011 04:51:24 +0000 (14:51 +1000)]
Avoid crash on exit

QSParticlePainter could call QSGItem::mapFromItem while the scene was
being destroyed.

Change-Id: If9356dae6aadf97b853c2aaf51870751bbbab711
Reviewed-on: http://codereview.qt.nokia.com/1023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones
13 years agoFix compilation
Olivier Goffart [Wed, 29 Jun 2011 16:20:52 +0000 (18:20 +0200)]
Fix compilation

qsgdefaultrectanglenode.cpp:221:22: error: narrowing conversion of '(((& c)->QColor::redF() * (&c)->QColor::alphaF()) * 2.55e+2)' from 'qreal {aka double}' to 'unsigned char' inside { } [-fpermissive]

Change-Id: I4f051f07d5db28fd03739343c255cc72d968a99d
Reviewed-on: http://codereview.qt.nokia.com/1004
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
13 years agoSupport setting an FBO as the render target for a canvas
Gunnar Sletta [Fri, 1 Jul 2011 06:19:52 +0000 (08:19 +0200)]
Support setting an FBO as the render target for a canvas

Change-Id: I8049580f1d2b27d6ebc4d595712939338c01b711
Reviewed-on: http://codereview.qt.nokia.com/986
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoFix text color in some cases of QML and QStaticText
Eskil Abrahamsen Blomfeldt [Tue, 28 Jun 2011 15:07:13 +0000 (17:07 +0200)]
Fix text color in some cases of QML and QStaticText

This reverts 518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3 which caused a
regression.

When writing systems are mixed and an underline is set on the font,
QPainter will set a pen with the current color and a new width on
itself before drawing the decoration. This would cause the recorder
in QStaticText to mark the pen as dirty, saving the current pen
color in all subsequent text items. The effect was e.g. that in QML
the cached color would override the current one, making it impossible
to change the color on the text without forcing a relayout somehow.

The right fix is to only mark the pen as dirty when its color actually
changes.

Task-number: QTBUG-20159
Change-Id: I0db1966787f543695bcba4a0c13328ae0a17625b
Reviewed-by: Jiang Jiang
Reviewed-on: http://codereview.qt.nokia.com/875
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoDocument threading issues with QSGEngine signals
Gunnar Sletta [Thu, 30 Jun 2011 08:43:31 +0000 (10:43 +0200)]
Document threading issues with QSGEngine signals

Change-Id: I769c0793929c4c90464f6e9fea46bd1a19fbacf3
Reviewed-on: http://codereview.qt.nokia.com/939
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoqmlplugindump: Improve error message for misbehaving plugin components.
Christian Kamm [Wed, 29 Jun 2011 08:06:39 +0000 (10:06 +0200)]
qmlplugindump: Improve error message for misbehaving plugin components.

Mirrors
6244008dcb43dde15dea3becbbec07d941b4759c
in Qt Creator/2.3.

(cherry picked from commit a39e975465a5dc0548891ccd93c4ff04165b60cd)

Change-Id: I995eebe065ecf8b4f185d61987240f39ad11b57f
Reviewed-on: http://codereview.qt.nokia.com/871
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoCorrect example snippet in QML positioner documentation
Alan Alpert [Wed, 29 Jun 2011 08:05:46 +0000 (18:05 +1000)]
Correct example snippet in QML positioner documentation

Task-number: QTBUG-19928
Change-Id: I0fd0f07525bbc1e08edaa636beee9f9ff4b8ad1b
Reviewed-on: http://codereview.qt.nokia.com/869
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoClean up addTextDecorations code
Jiang Jiang [Mon, 27 Jun 2011 14:39:42 +0000 (16:39 +0200)]
Clean up addTextDecorations code

Try avoid using QRawFont::fromFont since it requires shaping on Mac.

Change-Id: I90cc177662ecf6d0a95e722cdd0b06a01e5d0eaa
Reviewed-on: http://codereview.qt.nokia.com/793
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoqmlplugindump: Change to QtQuick 2.0 import.
Christian Kamm [Wed, 29 Jun 2011 12:23:01 +0000 (14:23 +0200)]
qmlplugindump: Change to QtQuick 2.0 import.

To be future-proof should QtQuick 1.0 ever go away.

Change-Id: I9bf46bc9f60f5ff61deb60fa2ffa90ea89c9c8d5
Reviewed-on: http://codereview.qt.nokia.com/899
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoqmlplugindump: Fix dumping with -path on Mac.
Christian Kamm [Wed, 29 Jun 2011 12:00:34 +0000 (14:00 +0200)]
qmlplugindump: Fix dumping with -path on Mac.

If the current working directory was a direct parent of the qmldir path
the exported modules had the path as the module URI on macs.

Also changes the QtQuick export back to 1.0 to make it work with
Qt 4.7.3. The version of that import statement does not actually matter
as long as it's valid.

Mirrors a change in Qt Creator:
http://codereview.qt.nokia.com/896

(cherry picked from commit d7ab0007d4b051f3cf12f01157b8b78d2fddf7c8)

Change-Id: Ib8caa8eda7f237b10e82df3afd560c118427aa8f
Reviewed-on: http://codereview.qt.nokia.com/897
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoFix UiPublicMember::lastSourceLocation.
Christian Kamm [Mon, 27 Jun 2011 08:07:29 +0000 (10:07 +0200)]
Fix UiPublicMember::lastSourceLocation.

Change-Id: Ia2c13bf250b0b0e3d87ff7bd64a3bead1c26c1f0
Reviewed-on: http://codereview.qt.nokia.com/755
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoqmldump: Fix export comparison.
Christian Kamm [Mon, 27 Jun 2011 09:01:20 +0000 (11:01 +0200)]
qmldump: Fix export comparison.

Compare the full uri/name, not just the uri. Also
QDeclarativeType::module was not available in 4.7.3.

Mirrors http://codereview.qt.nokia.com/759

(cherry picked from commit a0bd8d2dc68fdf993821b5eb881769448b34dffd)

Change-Id: Ib66ec79b929bd29e3aa27a1b70e5a5c1ec2d51e5
Reviewed-on: http://codereview.qt.nokia.com/762
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoDon't crash when QSGCanvas::sceneGraphContext() is called prematurly
Gunnar Sletta [Tue, 28 Jun 2011 06:00:39 +0000 (08:00 +0200)]
Don't crash when QSGCanvas::sceneGraphContext() is called prematurly

Change-Id: Ib15814bbc095c1be87a8fcddb574444d5258afbb
Reviewed-on: http://codereview.qt.nokia.com/813
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoFixed failure of tst_examples::namingConvention
Rohan McGovern [Fri, 24 Jun 2011 14:49:39 +0000 (00:49 +1000)]
Fixed failure of tst_examples::namingConvention

Since 1fab62b930edd4abed076e57ee997eae09159f22 in qtbase, demos and
examples are merged.  This was causing the test to unintentionally
iterate over the entire source tree.

Change-Id: I8e60c5742a3c15a4187f6c8cdac3cdc7f7ee24c0
Reviewed-on: http://codereview.qt.nokia.com/729
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoImprove failure message of tst_examples::namingConvention
Rohan McGovern [Fri, 24 Jun 2011 14:42:42 +0000 (00:42 +1000)]
Improve failure message of tst_examples::namingConvention

If this test fails, make sure the failure message contains the reason
for the failure.

Change-Id: Id9135a6bd0fc2cc50d604de545f4395ef6ef2294
Reviewed-on: http://codereview.qt.nokia.com/728
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging
Aaron Kennedy [Fri, 24 Jun 2011 06:37:03 +0000 (16:37 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging

Conflicts:
src/declarative/items/qsgtextnode.cpp

13 years agoRemoved unnecessary qobject_cast in QSGItem::childAt
Thorbjørn Lindeijer [Fri, 10 Jun 2011 15:54:29 +0000 (17:54 +0200)]
Removed unnecessary qobject_cast in QSGItem::childAt

No point in casting a QSGItem to a QSGItem and checking whether it
really was one.

Change-Id: Iaa82e1cb62f801f456b9020c4d410c13bfd3a9ea
Reviewed-by: Gunnar Sletta
13 years agoQmlInspector: Introduced more self-contained selection highlight
Thorbjørn Lindeijer [Tue, 21 Jun 2011 08:58:37 +0000 (10:58 +0200)]
QmlInspector: Introduced more self-contained selection highlight

The SGHighlight will update itself when its item changes position or
size. Previously, the hover highlight wasn't updating at all.

The highlight now also works correctly for rotated items (but not yet
for children of rotated items).

Change-Id: Idb14f356d779aef8e2d3e16a496685f0507a7060

13 years agoQmlInspector: Some code cleanups
Thorbjørn Lindeijer [Fri, 10 Jun 2011 15:52:25 +0000 (17:52 +0200)]
QmlInspector: Some code cleanups

* Inlined empty method implementations
* Removed unused QDeclarativeViewInspectorPrivate::cursosPos
* Small simplification in setting shortcuts
* Prefer const & for QList parameter

Change-Id: I5c2c04f32bb311a835d79a59206d6ebab212c73b

13 years agoQmlInspector: Implemented context menu for SceneGraph
Thorbjørn Lindeijer [Fri, 10 Jun 2011 15:47:33 +0000 (17:47 +0200)]
QmlInspector: Implemented context menu for SceneGraph

Change-Id: I467bdba42af0ff4b680c31a3545e059a56016a57

13 years agoQmlInspector: Implement tool tip handling for SceneGraph
Thorbjørn Lindeijer [Thu, 9 Jun 2011 16:15:34 +0000 (18:15 +0200)]
QmlInspector: Implement tool tip handling for SceneGraph

Change-Id: I84fc21f3e5bd96290910def26cd59e7e35719149

13 years agoQmlInspector: Some cleanup in the Color Picker tool
Thorbjørn Lindeijer [Thu, 9 Jun 2011 15:17:24 +0000 (17:17 +0200)]
QmlInspector: Some cleanup in the Color Picker tool

Also, the tool now picks a color on press rather than on release.

Change-Id: Ibe09e3cd7350521e90e0957e7d1afbce4d880e57

13 years agoQmlInspector: Implemented selection for SceneGraph
Thorbjørn Lindeijer [Thu, 9 Jun 2011 15:15:23 +0000 (17:15 +0200)]
QmlInspector: Implemented selection for SceneGraph

The highlight items are now based on QSGPaintedItem rather than the
internal QSGRectangle.

Change-Id: I50222116cf5f98ec93f914298a554b3d2d901c28

13 years agoQmlInspector: Unified mouse and keyboard event handling
Thorbjørn Lindeijer [Thu, 9 Jun 2011 11:30:47 +0000 (13:30 +0200)]
QmlInspector: Unified mouse and keyboard event handling

Introduced a common AbstractTool interface so that the
AbstractViewInspector can forward mouse and keyboard events and
also implement the keys to switch tools.

The AbstractLiveEditTool still exists as the base class for all
QDeclarativeView based tools.

Change-Id: I7c00b05fba58828378543645e32732ad5f9fd5d0

13 years agoQmlInspector: Removed private header postfix and Qt namespace
Thorbjørn Lindeijer [Wed, 8 Jun 2011 17:37:25 +0000 (19:37 +0200)]
QmlInspector: Removed private header postfix and Qt namespace

Renamed the headers back to normal since they are not included in a Qt
library. Also took the classes out of the Qt namespace and back into
the QmlJSDebugger namespace.

This is mainly to make it easier again to port changes back into the
version of the inspector shipped with Qt Creator.

Change-Id: I820c2372089c24a42404b4055be1b938e384e352

13 years agoQmlInspector: Share code between QGV/SG based QML debugging
Thorbjørn Lindeijer [Wed, 8 Jun 2011 15:47:47 +0000 (17:47 +0200)]
QmlInspector: Share code between QGV/SG based QML debugging

Introduced AbstractViewInspector, which forms the base class for
QDeclarativeViewInspector and SGViewInspector and is where common code,
like handling the protocol is placed.

Some virtual and pure virtual functions exist which the subclasses will
override or implement for QDeclarativeView/QSGView specific stuff.

Change-Id: Iad7d15e19e0701d550ec42288fdad7490cf9b8a7

13 years agoQmlInspector: Initial support for QSGView based applications
Thorbjørn Lindeijer [Thu, 9 Jun 2011 08:52:10 +0000 (10:52 +0200)]
QmlInspector: Initial support for QSGView based applications

Currently only displays a rectangle highlighting the item below the mouse,
but it's a start.

Change-Id: I9946a923add4c53780546ac4bf138fe731508da2

13 years agoUpdated tst_nodestest to use the DirtyForceUpdate flag.
Kim Motoyoshi Kalland [Thu, 23 Jun 2011 12:13:24 +0000 (14:13 +0200)]
Updated tst_nodestest to use the DirtyForceUpdate flag.

Changed test to use DirtyForceUpdate instead of DirtyAll, and
removed DirtyRenderOrder and DirtyAll enums which should not
be used.

13 years agoqmlplugindump: For extended types, remove exports of the base object.
Christian Kamm [Wed, 22 Jun 2011 15:13:56 +0000 (17:13 +0200)]
qmlplugindump: For extended types, remove exports of the base object.

Reviewed-by: Kai Koehne
(cherry picked from commit 21af9f0be1dd0d9be6c3767074fdfbd54e3b8372)

13 years agoqmlplugindump: Build debug version if possible.
Christian Kamm [Wed, 22 Jun 2011 12:59:48 +0000 (14:59 +0200)]
qmlplugindump: Build debug version if possible.

Done-with: owolff
(cherry picked from commit 19b666195e293a71ef918f4a7f91d7f8be5f69bc)

13 years agoMerge multiple lines of text into a single geometry node
Gunnar Sletta [Thu, 23 Jun 2011 08:40:39 +0000 (10:40 +0200)]
Merge multiple lines of text into a single geometry node

Long term, we might want to have this kind of logic in the QSGGeometry
class through a grow() function or in the QSGRenderer, but we
only have this one usecase where it actually makes sense right
now, so I'm keeping it local.

Change-Id: Ibbb0dd4a6e4b587154e26ffc2a34375fbb4a571d

13 years agoFix regression against 4.7
Aaron Kennedy [Thu, 23 Jun 2011 01:20:00 +0000 (11:20 +1000)]
Fix regression against 4.7

Task-number: QTBUG-19136

13 years agoSkip unreliable test
Aaron Kennedy [Wed, 22 Jun 2011 08:39:22 +0000 (18:39 +1000)]
Skip unreliable test

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 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 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 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 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 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 agoInitialize member variable
Gunnar Sletta [Tue, 14 Jun 2011 07:49:58 +0000 (09:49 +0200)]
Initialize member variable

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