Removed generated files.

Elaborate on the MouseArea changes

Fix usage of QT_SOURCE_TREE

Functionality has been moved into qt_example.prf

Fix missing include->load conversion of qbase.pri

Use feature profile loading instead of direct inclusion.

Fixed clock_gettime() library dependency.

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

Reviewed-by: Marius Storm-Olsen

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)

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

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

Update "What's New" with change to Binding.

Replace QPerformanceTimer with QElapsedTimer.

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

Reviewed-by: Charles Yin

Add docs and test for Binding changes.

Change-Id: I6bce140bf80c3e0defd7603aecfb7f658520f4d3
Reviewed-by: Martin Jones

Restore original binding when Binding's when clause becomes false.

Change-Id: I7e2ba1f6e3cd1e049ec2666ab8191cb91acbfe50
Reviewed-by: Martin Jones

Make Binding a value source.

Change-Id: I1a9003f1e506c53e172bfae418f536ad0da2bf47
Reviewed-by: Martin Jones

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

Small doc fix.

Change-Id: Id3720c9ad6d3dc459cf7b726a443cc1ac390e223

QDeclarative: fixed clean animation lists

Change-Id: I9dd8b4fcd3f04193410710981a511b9f69e5dc19

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)

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)

Remove more webkit dependency from qtdeclarative.

Change-Id: I75fd903e6a8160210652c2cec3c4636e908a9ade

Remove the examples/declarative/demos copy.

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

Change-Id: I1a2f9cc994de13690bbc77d41005051e340291f7

Ensure doc code snippet can be loaded by QML engine.

Change-Id: I2249a064a0c2afa3de1a9252ab4796af5bbeacc8

Remove webbrowser demo from qtdeclarative module.

qtdeclarative should not depend on webkit.

Change-Id: I82e3f49dbe710e408c1a74911787541a9ea9efa1

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative

Conflicts:
src/declarative/debugger/qpacketprotocol.cpp

Change-Id: I61f500a08ce73def34c093344bfdad44a6c9a6f1

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

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

Export more VisualModel symbols

fix shadow build error

Change-Id: I68c8edac98389c487c1ac09bb74d43fdeb85cdc3

QmlDebugger: adding slots to items in Live Preview

Reviewed-by: Kai Koehne
(reapplied commit 89d9b83aa26db4f528250c3fe4716b81955c6929 from qtcreator)

QmlDebugger: parsing packets iteratively in the communication protocol

Reviewed-by: Kai Koehne
(reapplied commit fea13a449c59690ae7b7f43aa64f50c0a290a2cf from qtcreator)

Compile fix.

Compile.

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)

qmlplugindump: Dump revision property.

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

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

Update SG items with recent GV item changes.

Change-Id: Ib9cadea91ab3717bee0caf2071102a100e81969d

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)

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)

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)

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)

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)

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)

fix qmltest unit test failures

Change-Id: I489d1559411f5804f11f4601e34011bc38742b02

copy other .qml .js files during build time

Change-Id: I08db54c7cd5d2ae7bbad28440cc36f6332a190c9

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

Export QSGVisualItemModel

Necessary for DataParticles.

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

qmlvisual is broken and unmaintained.  Remove it.

Change-Id: I9d522d3db81586da8f24be2b3becfdbf2968d933

Update TextBallons .pro file

Botched the previous alteration

fix typos

Change-Id: Iff14f7378bf8fa063bd6096a8662d47320564af6

Fix typo.

Change-Id: Ide770bf31258b84b48ee1f588707c3415d662ccb

fix the qmltestrunner building errors

Change-Id: Ib544544615d8aa96d2e5af8c82766472e1ed4018

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

QmlDebugger: removing slots in Live Preview

Reviewed-by: Kai Koehne
(cherry picked from commit 582be247290fd015798b3d84d692c0236dbff4e1)

QmlDebugger: adding slots to items in Live Preview

Reviewed-by: Kai Koehne
(cherry picked from commit 1f0f8a1b15fa4efa58feb2799614afc8bf0bd6e3)

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

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)

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)

Pass QList as const reference when possible

Avoids some reference counting.

Reviewed-by: Kai Koehne
Change-Id: I4de83aa4df6833fa2287ac1854bbb0052d15cee9
(cherry picked from commit bdd8f188ac352c99ee218318a59089f387a31d60)

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)

Mention that positioners may conflict with anchors.

Change-Id: I8c89abcc6dd18915dca0eb9643c2376b2d128a29

Work around remaining 'make check' failures.

Change-Id: Ie4480d4f05f5d784eb277fa2be6e502da00524f8

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.

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

Update image stream example

ModelParticle has died.

Some fixes for tests/auto/declarative/examples autotest

Change-Id: I58b4c52c64fc51863f14f50e077c975928e71ebb

Remove webkit dependencies from qtdeclarative.

The webkit examples and demo should be added to webkit repo.
See https://bugs.webkit.org/show_bug.cgi?id=61596

Change-Id: Iffb2c5eb7f95a9bb563ad61c6002274cec54cd24

Skip the qdeclarativeimage and qdeclarativeborderimage mirror test

Also mark qmlvisual tests as CONFIG+=insignificant_test

Change-Id: I0febeafca4d9aa08ac17a99c97880520be78a35a

Revert "Make QSGTextNode back-end for QML's TextInput"

This reverts commit e430f1336881850a73a54a291e0276160d568212.

Make tests compile.

Change-Id: Iecb50641f927b82533e25262ba1ab8a0a14a108c

Remove webkit dependency from test.

This wasn't a real dependency anyway, as all the code that used it
is commented out.

Textures not scheduled for deletion while scrolling QML view.

This happened when scrolling a view using an Image delegate (containing
QSGTexture). All textures were deleted at exit, but it is important to
immediately schedule the texture for deletion whenever the delegate is
destroyed to avoid unnecessary high memory consumption.

Task-number: QTBUG-19511
Reviewed-by: gunnar

Multi-line sprite files will now work

Revert "uses the cached argument info"

This reverts commit 68d18d77ebac49c2b863c425969c70c5426864cd.

Revert "cache the arguments in property cache data"

This reverts commit 30327650798ba63281c7b9344c9d824d00dce82a.

Fix QSGImage autotest.

Implement "mirror" property for BorderImage.

Change-Id: Iee5b252ce1b0d39da42f553cf2ae782ad14d297f
Reviewed-by: Gunnar

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

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Update licenseheader text in source files for qtdeclarative Qt module

Update licenseheader text in source files for qtdeclarative Qt module

Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.

Reviewed-by: Trust Me

Small optimizations in distance-field cache.

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

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

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Doc: Fixed qdoc warnings.
  Doc: Various fixes to documentation, some based on changes in master.
  Doc: Added missing project and desktop files.
  Squashed commit of changes from the 4.8-temp branch.
  Doc: Fixed incorrect inline snippet for an example .sci file.
  Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)

Doc: Fixed qdoc warnings.

Doc: Various fixes to documentation, some based on changes in 

Doc: Added missing project and desktop files.

Squashed commit of changes from the 4.8-temp branch.

Doc: Fixed incorrect inline snippet for an example .sci file.

Task-number: QTBUG-18812
(cherry picked from commit 4e8672c87bd7e740b01ca29a2a3c8ba902ed664b)
(cherry picked from commit d1e70c3dd05df1f92f7a895de0b86b0c3a562511)

Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)

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

Optimize distance-field glyph recycling.

Unused glyphs in the cache should not be overwritten if they are
immediatly reused after being unreferenced.

Set paintNode to 0 after deleting it.

Otherwise, we will get crashes if we're switching back and froth
between ItemHasContent set to true and false.

Don't store texture references after the view has gone away

This is a partial fix only. We will eventually need to get
proper sharing of resources across multiple GL contexts, but this
fixes the autotest and will work for most usecases.

The task QTBUG-19455 has been created to solve it properly.

Make QSGTextNode back-end for QML's TextInput

To get the benefit of different glyph node backends, the
TextInput item has now been moved over on SceneGraph's
TextNode instead of QPainter, and selections and
decorations are painted using QSGSimpleRects.

qmltestrunner not installed by default

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

Compile on Mac

Fix typo in API: QSGContext::schdelueTextureForCleanup.

Reviewed-by: kim

Support change slots for properties starting with '_'

According to ECMA-262r3, property names may begin with a letter,
underscore ('_'), dollar sign ('$'), or unicode escape sequence.
We previously supported Change slots for properties only if the
property name began with a letter; this patch adds support for
properties which begin with one or more underscore.

Task-number: QTBUG-17950
Reviewed-by: Aaron Kennedy
Change-Id: I6f28bde18a38e32c2131e0990fe0f69bda36f90e

Ensure that showDirs is respected in FolderListModel

Calling index() on a QDirModel can modify the filters applied.
This patch to FolderListModel ensures that filtering is reset if
required, so that programmatically selecting a subfolder in a
folder does not cause that subfolder to become visible if showDirs
is set to false.

Task-number: QTBUG-17837
Reviewed-by: Martin Jones
Change-Id: I449321d5170ecedf2a0cb36483d50020305a26dd

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

Remove ModelParticle

Nothing is using it anymore, lets keep it that way.