Compile

Change-Id: I3bc97df3cb768bcfba6581a291c6a8136cec8a92
Reviewed-on: http://codereview.qt.nokia.com/1024
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Improve performance of v8 string hashes by using symbol id

The symbol id is a unique integer associated with a string symbol in
V8.  If two symbol ids are equal, then the strings are also equal.
However, if the two symbol ids are not equal, the strings may still
be equal.

Change-Id: Ic28f51a1eba568ae4b2a054e278f6e5e454725d6
Reviewed-on: http://codereview.qt.nokia.com/990
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Variants should compare as equal

We need to implement an object comparison callback to ensure
that two variants with identical values (although different JS
objects) compare as equal.

We also add a v8 autotest for this callback.

Change-Id: Idd1ab602d31b398a937d4df4a7bd091aa205de24
Reviewed-on: http://codereview.qt.nokia.com/989
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Update V8

Change-Id: I2736cb8fffaace5cbb9e91d12a75bdedf3f80627
Reviewed-on: http://codereview.qt.nokia.com/988
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Add toString for variants

Change-Id: Ia64adeb3640f7f7eedccd7015de729969232a07f
Reviewed-on: http://codereview.qt.nokia.com/987
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

update canvas example

Change-Id: I8a797b85f88370c6ddfe64d40a6888aba06998d7
Reviewed-on: http://codereview.qt.nokia.com/693
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>

Merge branch 'master' into v8-clean

Conflicts:
src/declarative/qml/qdeclarativevme.cpp

Change-Id: I0bbc12c06d40c70433730cb33c4e9b461520263f

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging

Conflicts:
src/declarative/items/qsgtextnode.cpp

update canvas example

Change-Id: I901532eafabc0344f3978c0093ee56ed230c74b0

add drawRegion signal for canvas item

Change-Id: I8dadcb292b5c99d5f520672ab02db3490b21e8fa

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

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

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

QmlInspector: Implemented context menu for SceneGraph

Change-Id: I467bdba42af0ff4b680c31a3545e059a56016a57

QmlInspector: Implement tool tip handling for SceneGraph

Change-Id: I84fc21f3e5bd96290910def26cd59e7e35719149

QmlInspector: Some cleanup in the Color Picker tool

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

Change-Id: Ibe09e3cd7350521e90e0957e7d1afbce4d880e57

QmlInspector: Implemented selection for SceneGraph

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

Change-Id: I50222116cf5f98ec93f914298a554b3d2d901c28

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

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

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

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

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.

qmlplugindump: For extended types, remove exports of the base object.

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

qmlplugindump: Build debug version if possible.

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

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

add svgpath example for canvas context2d

Change-Id: Ia54b5fd842d13c15c7914d1a1e6b2b2d5718bf81

expose QSGContext2D::setPathString to v8 Javascript API

Change-Id: I97a26c6c5273ba8800b13ca5f1f994eff04a24b8

add svg style path string support for context2d api

Change-Id: I6b815f58c1d96e88fe9b592515bf62b749011b8e

windowShown is a property of qtest, not util.

Change-Id: I3d96b6bd43fc8fdfdf9a916032efd9a7360aafba

get the caller file & line number from v8 stack trace.

Change-Id: I0ffebd2d22702bc14e1629b8bc0455a9cf8ea416

Fix regression against 4.7

Task-number: QTBUG-19136

Skip broken test

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8

Skip unreliable test

Make test more reliable

Support refreshing V8 bindings

Correct rounding behavior

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8

Correctly wait for render thread to exit

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8

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

Fix autotests

QSKIP crashing tests until QTBUG-20017 is fixed

Make QSGCanvas::grabFrameBuffer() more reliable

Fix text decoration position for simple Text node

qmlplugindump: Add -v option.

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

qmlplugindump: Fix emitted tooling version.

Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1.

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

Drag items relative to their scene position.

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

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

Only print debugging when THREAD_DEBUG is enabled

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

Rewrite last rewrite

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

Fix typo and put the correct snippets in the output.

Reviewed-by: David Boddie

Start out with a distance field cache that fits more characters

Compile when qreal is not a double

Compile fix for MSVC.

Removed unnecessary calls to QSGNode::destroy().

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

Merge branch 'master' into qtquick2

Implement caching of the distance fields...

Change-Id: I823341b9b53e885dcd004e17e319cf033dc21c45

Add "DELETE" support to XMLHttpRequest

Optimize common binding writes

Reenable shared bindings

Now with extra "supports nested components" goodness.

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.

Temporarily disable shared V8 bindings

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

Compare QDeclarativeProperty's in a flag agnostic way

Merge branch 'qtquick2' into v8

Don't leak memory in benchmark

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.

Add "shared mode" to QML contexts

Cleanup

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

Output the rewritten binding with QML_REWRITE_DUMP

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

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

Speed up distance field generation by another 20% or so.

Speed up distance field generation by 5-20%

Renamed QMLRenderer -> QSGDefaultRenderer

Change-Id: Ib1f00d45cecd3b438148adce2f7cf247030b2dfb

Remove annoying warning

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

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

Print out a warning when attributes are enabled

Disable attributes from shader effects

Reviewed-by: Samuel

Fix autotests

Update V8

Cleanup autotest pro file

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8

Register QList<QObject*> metatype

Correct handling of CONSTANT properties

Were being marked as missing a notifier instead.