Fix MSVC warning C4819 under Chinese locale

warning C4819: The file contains a character that cannot be represented in
the current code page (936)

Change-Id: I53dc345e03b0ec6f951bd2763bc1bab4aef63d04
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Fix warnings about overloaded virtual functions in tests (CLANG).

Change-Id: I1f4bda77d0520766813201726f53b439b6094a24
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

Tests: add autotests for TextEdit and TextInput

Check the selection is not cleared when the control receives
a focus out event with one of the following reason:
- Qt::ActiveWindowFocusReason
- Qt::PopupFocusReason

Change-Id: I38f4a4cba5e769f19de4e327d03be57a8d1d36a7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Handle focus events directly in TextEdit.

Instead of relying on the item change
where we don't get focus reason, use
focusInEvent and focusOutEvent.

Change-Id: I2db7d81c67c65595b929fdcedc568af360831c5c
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

TextInput: Update text deselection on focus out event

The text selection should not be cleared when the focus
out event received has one the following reasons:
- Qt::ActiveWindowFocusReason
- Qt::PopupFocusReason

When the user opens a menu or navigates to another window,
the eventual selection should not be clearer.

This also makes the behavior consistent with TextEdit.

Change-Id: Ibc6242cb2f8207cf5281925c8e20b88394f21eea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

TextInput: Handle focus event directly

Use focusInEvent and focusOutEvent instead of changeItem
to handle focus event. (One benefit is the focus events
have the focus reason and changeItem doesn't).

Change-Id: I164820f375f0ffddc529d59565a3e448b84c6042
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Focus reason

When trying to do for example text handling it becomes
obvious that focus handling is not proper.

A mouse click focus should de-select text,
while a window change should preserve the selection.

Re-introduce focus reason.

Change-Id: I3322c976437cba68938d7c9188e549bdb499fa5a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Fix rendering of subpixel positioned native text

To get accurate sampling of the native text rendering, we use
nearest filtering. This, however, does not work well when we're
sampling in the middle of pixels and the result is that with
text which is positioned at 0.5 offsets, we will sample the
wrong pixels and get artifacts from this. The main use case
for native rendered text is unrotated and unscaled text,
so we fix this use case by pixel-aligning the translation
factor.

Done-with: Samuel

Task-number: QTBUG-30022
Change-Id: I6911196d6ff491dca3b329c42da1c6dd7263cff0
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Disable qv8profilerservice test. It is very unstable

Change-Id: Ic7fada8ca457b15fb62a47d2137de7d6f8b1711a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Disable more unstable tests

Change-Id: I54db72466ca50d65dd39e9c8e25d3a366cb737ea
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Remove spurious include

While it's discouraged to use the entire module headers inside Qt, this
particular example also compiles without the line.

Change-Id: I75b6fc09e11d00df2f19f5db9b0209ed4cd82844
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

Add core application functionality to Qt.application in QML

This exposes some information to QML which is available on
the QCoreApplication instance.

A future change should make it possible to restrict this for use in scripting
environments (which should not have access to the QCoreApplication). That has
been left out of this change because proper support for such restrictions is
not yet in place.

Change-Id: Ica144fcfb0b42fa6df8d0cb1c7c03eb97282b489
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Android support: build fixes

Change-Id: If829341b0baef7b253a386a195d3b5e4238b8103
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Accessibility: Adapt memory management for Qt 5.1

The model was changed to cache interfaces, so
do not try to delete them.

Change-Id: I5a97a6aca38036803c62d90988bb6d02196f0b84
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>

Fix crash for keypress without active focus.

If there was no active focus item
we need to use tryShortcutEvent with
 the window as target.

Change-Id: I420925781bbbda79fe2a62a5774230ae77c2cd34
Reviewed-by: Liang Qi <liang.qi@digia.com>

Remove extra semicolon.

Change-Id: I5830f8dd2c636ad8653506c04f8ea1a9ac000f9a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

Load "@2x" images on high-dpi "retina" systems.

Check for the existence of a "@2x" file when loading
an image from a local file url. For example,

Image {
source = "foo.png"
}

will load "foo@2x.png" if that file exists.

Change-Id: I37688d035bc9eb412d54be0eb758dd52ebfa5d90
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

Work with synchronous replies from a custom QNetworkAccessManager

Forward port of e5783b79887299d094 from QtQuick 1.

Task-number: QTBUG-27723
Change-Id: I4332dd72bb9d65167307c1ac5ce24e93b14cff5f
Reviewed-by: Peter Hartmann <phartmann@rim.com>

Fix relative URL in parallax example

Samegame demo moved a while back, this didn't get updated.

Change-Id: Ib34a09f606528e1e53650bbbd4d19787b1864bcb
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

Added photosurface example to demo PinchArea/MouseArea together

It seems to be important to put the MouseArea inside the PinchArea
in order to support simultaneous drag/rotate/pinch.

Change-Id: Ic3ec6a131bd2d4c7f8a8560cd9c3015a717fef20
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Autotests w CONFIG+=parallel_test don't depend on activation or focus

If the test does requestActivate() or relies on isFocusWindow(),
the test cannot be parallel_test.  Also, a lot of the tests don't
actually need the window to be active, only exposed; and waiting
only for exposed is likely to make them more stable.

Change-Id: I0845b9b12ddf7f0c8906d9738a3e26d46ab98820
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

PinchArea autotest doesn't depend on window activation; QScopedPointer

The QQuickView pointer is guarded by a QScopedPointer to make sure it
will be deleted if the test fails.  And because we don't depend on
window activation, the test should be parallelizable.

Change-Id: I33a5dcff037087d9752b264eb067196c2a5be535
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

pressedCanceledOnWindowDeactivate pops up a second window

in order to cause the first one to be deactivated.

Task-number: QTBUG-29953
Change-Id: I7fec66b07976b2afc78941d39c593f99ea484522
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

Enablers for input methods on Android

Change-Id: Ic26722cf530e7a787e7a8f92b645e3c4883d9822
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

adding QtQuick.Dialogs, with FileDialog implementation

This will obsolete the QFileDialogItem in desktop components and be
available to all QtQuick applications.  The QML FileDialog type is
dynamically defined in the plugin by detecting which implementation
will work on the current platform.

Change-Id: I073c7a84bff6c02cf592dc46822a5a4b9c9bcaea
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

Do not print out leaked pixmaps by default

Change-Id: Id112def9710efa943ffc5350a25d40d4c4f463a1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

Added examples on how to use FBOs with scene graph.

I also cleaned up the naming of the other scene graph examples a bit,
so that they sort together in the samples list and have a more obvious
naming scheme.

Task-number: QTBUG-29548
Change-Id: I455eacb02c06058a6d49e12e4f1813ec80b655f6
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Fix docs for Canvas.renderStrategy, the default is Cooperative

Task-number: QTBUG-29833
Change-Id: I3ee680d2decb01ff514852b2445617e6ab1b1480
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Fix the QtQml's use of plugins for value type providers

When the QtQuick library is loaded, it runs a global constructor that
installs the QtQuick value providers. But those providers are never
uninstalled when the library is unloaded, resulting in a dangling
pointer stored in QtQml's singly-linked list of value providers.

Since cafb02911a29b98ac2652fde64e95870e70fd547, QLibrary will unload
plugins after inspecting their plugin metadata on Mac and Windows. If
QtQml is trying to load a plugin that links to QtQuick (in particular,
*the* qtquick2plugin plugin), it would cause the value provider to go
stale.

To make matters worse, it's quite likely that the plugin would get
loaded soon after, at the same address in memory, which causes the
valueTypeProvider list to become cyclic.

Change-Id: I6f4db5475ceeaba766d9e9c78f86266c9a65806a
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

skip failing constantUpdatesOnWindow test for now

This test tries to render some frames and count them; but even 10
frames in one second seems to be too many to expect on the CI Macs.

Change-Id: Id9cd700499101ca10afeddee89bc183fef7d30d3
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Allow shortcut overrides.

When delivering shortcut events, make it possible
for the current active focus item to override the focus.

The use case is having an edit/copy menu (ctrl+c) and
a text edit. When the text edit is focused, it should
override the global shortcut.

Change-Id: Ide5b94832289c32762ef7304cdc94c107301d579
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

Avoid ambiguous include guards in SG classes

These include guards stem from the olden days before the QSG
prefix and many of them are conflict prone, which can lead
to pretty bisarrer errors for the user.

Change-Id: I0e76c68a588404b6e82be9ecc2e7afa3b9a48e78
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Change Canvas to use Image and antialiasing by default.

Change-Id: I3033cba7c2f9e1dd9886e8f92ece1a2f43f60c01
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

Various improvements to Canvas examples

I noticed these examples were rather "aestetically
challenged" and decided to make it a test case for our
WIP style guidelines.

- Use consistent margins (12 px)
- Use proposed color palettes
- Use proposed fonts and header styles

I created a new Slider graphic and moved this into
the shared folder as I think it is useful for other examples.

I removed a lot of unused files which seem to have been added
but never actually used.

I also found several bugs in our implementation, including
not scaling or rotation around the correct origin.

In many cases I simplified the examples, removing
variables/sliders where they did not add significantly
to the example itself.

Change-Id: Ie09da33deaf56a3ec45a2031b87a24a8602e994a
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41

Improved documentation in the Screen attached property

It can attach to the Window now too, so needs some clarification
about when to use it that way.  The orientation properties also need
more description to avoid confusion.

Change-Id: Ib537422f6001d8b64de176e60a6433b2e25551b9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

Fix warnings about shadowing members

util/qqmlpropertymap.h:87:9: error: declaration of 'parent' shadows a member of 'this' [-Werror=shadow]
[and others]

Change-Id: I2ff1a3c133efe2132e74dad00596931a84a7f421
Reviewed-by: Alan Alpert <aalpert@rim.com>

ListView's highlightMoveDuration should default to -1.

Change-Id: Ibb53cc21b4f1f301569cd7724c60cb8df978921a
Reviewed-by: Bea Lam <bea.lam@jollamobile.com>

Flickable shouldn't grab the mouse until it starts an effective move.

If the boundBehavior prevents the flickable from moving its content
item in response to a drag it shouldn't grab the mouse as that will
prevent a parent MouseArea or Flickable from handling the drag.

Task-number: QTBUG-29718
Change-Id: I3a1be4ed0132b91dca2fb0387ecefd39275a52da
Reviewed-by: Alan Alpert <aalpert@rim.com>

MouseArea shouldn't grab the mouse until there is an effective drag.

A MouseArea shouldn't prevent a parent MouseArea or Flickable from
handling a drag event unless it is going to do something useful with
it.

Task-number: 29717
Change-Id: I24016994f6cf9116382ef7faeb50b10e5716e10e
Reviewed-by: Alan Alpert <aalpert@rim.com>

Typos: tripple->triple

This enables grepping.

Change-Id: Ibf85800b998a02645c50b1b84d42088d16091378
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

Stabilize clicking in QQuickTextEdit test

This test would try to emulate mouse clicks
and not wait inbetween. That can lead to clicks
spilling over to the next mouse event.

Change-Id: I320f86453215190a1c694ba49c0fc3831dcb60b9
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

Make sure exposeEvents trigger a render pass

We needs this on non-compositing window managers to trigger
repaints on partial updates.

Change-Id: Ied5f3e854173c5e00ad7e1222aeb66eb9c96158c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Add Test for Animating Qml Dynamic Properties using QPropertyAnimation

Test case for calling QQmlVMEMetaObject::metaCall from
QPropertyAnimationPrivate::updateProperty

Task-number: QTBUG-29082
Change-Id: Iecab74132eb3a843e53356effe3b6bbe4d5a8fb2
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

Don't print leak warnings on exit by default

Task-number: QTBUG-29780
Change-Id: I6f35253dbec6346af239c0ab341caad9f4f9b862
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

Doc: Fix paths and add missing project files for QML and Quick examples

This change fixes a number of 'example path does not exist' warnings
from qdoc, and adds .qmlproject files for pure qml examples so they'll
appear correctly in the example manifest files.

Change-Id: Id0a424c4826fb5d8ebe6c3309bf33b976ff8477c
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Fix QQuickTimeLine::accel() & accelDistance()

Do not compare real numbers (velocities, accelerations and distances)
to 0.0f, but use qFuzzyIsNull() and qIsNaN().

Task-number: QTBUG-29144
Change-Id: I8fe7ebfbc9f665fa2507e66344d081ef2f43b181
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

QQuickScreen is exposed as an attached property on Window too

Change-Id: I13ee75247cbe6238de1b58cf0005c39fc4314e96
Reviewed-by: Alan Alpert <aalpert@rim.com>

Fixed build when Qt is configured with -no-opengl.

Task-number: QTBUG-28849
Change-Id: I331ebca76892ce7ffbc6f8e03ff4afe0c8e28d5e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Add QQuickTextDocument

Adding QQuickTextDocument as a way to
access the QTextDocument of QQuickTextEdit from C++.

This makes it possible to use a
QSyntaxHighlighter from C++ without exposing more
than one single qml property in the TextEdit.

Change-Id: If1790b591493adcb0b68aef0c8ca706e00450657
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

Docs: Slow Down Animations only exists in qml1

The functionality was part of qmlviewer.

Change-Id: Iaf2e19acf54e6773e2b79659f4dc51b92de91dd4
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

Clarify Component::createObject docs

Task-number: QTBUG-29650
Change-Id: Ie6f9027ff779f8a513a52b425d9a393c0ecd9c7d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Let rounded rectangles be antialiased by default

This was the behavior in Qt Quick 1.1, so we should keep it

Change-Id: I5c6968225e20b06f550c52741fff571088b0100b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Improved animations in the new render loop

To advance animations in line with vsync, we used a dedicated event
from the rendering thread which we fired immediately after sync. This
is a bit elaborate as we know in Gui when sync is complete and we can
just animate there and then.

This means we can remove all animation logic from the rendering
thread, making it simpler.

I also updated the syncAndRender pass so that it does not render
anything if the scene graph reported no changes during the
sync pass. This will prevent non-visual animations and property
updates from triggering render passes which will save quite a
few cycles.

Change-Id: I62bb5484f0673f99abe726fca5a9b424f6b0a317
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Fix embedding images in text elements

It seems that the the inner target rect has either been added
recently or its default has been changed to something invalid,
because we need to set it to the same as targetRect for the
image to show up at all.

Task-number: QTBUG-29560
Change-Id: I0fe6b7c5ab07afc780b8ea33a7ccc210861e0821
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Make the base URL available to QQmlExtensionPlugin

This is for the benefit of any plugin which needs to interact with the QML
files or related assets which are also located in its import directory.

Change-Id: Id23ec279b4d017bd3f620c3a7916dac9f9ac29bc
Reviewed-by: Alan Alpert <aalpert@rim.com>

Add qmlRegisterType for Composite Types

This is equivalent functionality to registering a composite type in a
qmldir file, a type name in a versioned module is associated with a
given file. This function now allows that to be done easily from C++.

Change-Id: I1cf44b92c3ad7fee593f4f84773c35b56253e628
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

qmlplugindump: don't crash if a composite type was a registered

This doesn't actually result in putting any information about the
composite type into the output, though.

Change-Id: I160702578f0acd22eff98e8afa288b3c9fb20076
Reviewed-by: Alan Alpert <aalpert@rim.com>

Doc: Update QtQuickTest documentation

Add some information about -input, -functions and -help
command-line options. Add some examples on how to run a
single file and a single function for a QtQuickTest based
test.

Change-Id: Icd5f92bf8541aa412e2cd18d82dec16a85fe78c9
Reviewed-by: Alan Alpert <aalpert@rim.com>

Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I33db683ebf12248b2ed14eeaf65c4bcade14bfbf

Add Composite Types to QQmlType

When a composite type is loaded from a QML file, it now generates a
QQmlType entry in QQmlMetaTypeData.

Change-Id: I9b127dff7955456aacb25138fa6ea8efb7bb9221
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>

Doc: Correcting typo "without with"

Change-Id: Ibacbb9aefe9a333994014aec17a0079477a4618f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

GUI render loop did not render on expose, nor clean up properly.

Change-Id: I6f9ab43ad6d149295487d9f69ceb0131cd142776
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Fix missing TextInput::remove(int start, int end) docs

Change-Id: I0c98e713d53391a191435e5c17b58becddf6d451
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

QQuickPlatform: remove QT_{BEGIN,END}_HEADER macro usage

Change-Id: I219517d740fa7385e923a9e09cb7e241378f8576
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

FolderListModel: prevent assertion failure when filter selects 0 files

If you do nameFilters = "*.foo" and there are no matching files,
there was an assertion failure due to inserting rows from 0 to -1:
ASSERT: "last >= first" in file itemmodels/qabstractitemmodel.cpp

Change-Id: I4a3642906a4588bebc699b8d99438726676fb4ca
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

Ensure EtcTexture always provides a valid textureId.

Change-Id: I1e7e8095593838f0fc1d78d1cb5a146787f748a7
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Doc: Removed reference to deprecated \badcode command.

QDoc doesn't differentiate between \badcode and \code. They both look
the same in the output.

Change-Id: Ia0580f7d664ad5e33b48d6511dac7c61349cacce
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Add license files mandated by (L)GPL.

Currently only qtbase includes the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules as well, so that the
(L)GPL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL

As an addition to above, added also LICENSE.FDL. All the modules
additionally require it, since they include at least *.qdoc files and in
some cases a couple of others.

File received via
wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL

Change-Id: I35cb3523061cfb041084fe9a7e60928c44e224b2
Reviewed-by: Jason McDonald <macadder1@gmail.com>

Add QQmlPlatform (exposed as Qt.platform)

Change-Id: If34603fd8fbd907bc063b52ea31848eabdb49f61
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>

A MouseArea should not receive move or release events if the press was not accepted.

Change-Id: If70650d7150b224f4460697a953611dd37d57af1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Remove QPointerBase bic check.

QPointerBase is not public or exported and it is to be removed

Change-Id: Ieb7360a1a01125d4bff20140b02ec71a076440cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

only instantiate variable when required

variable is only used for debugging purposes, where debugging part
is inside preprocessor check. Creation of the object should be there
as well.

Change-Id: I6c9e842ad05d8e45f6d67f5e5dedebc896cda157
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

QQuickItem::childAt(x, y) takes child transformations into account

Task-number: QTBUG-28706
Change-Id: Ib1738eac1319361398b1898db341d6e4be0fe5fd
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

DesignerSupport: Fix rendering in designer for if new items are added

The SG nodes are exchanged if the hierarchy the Qml hierarchy is changed.
So the SG root node should be always updated for every rendering.

Task-number: QTCREATORBUG-8699
Change-Id: I069142e4c5fc65efc3485017fa000ed7e8f2b350
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Remove use of QPainter::HighQualityAntialiasing. It has no effect.

Change-Id: I7e1d07a9f34d6edf9dbe3449d34636f700218532
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Fix extending example.

The antialiasing was broken due to wrong flag being used and that the
bounds were outside the texture and chapter 5 and 6 did not compile.

Change-Id: Ib7c4d8c276a3cc5583ff794e10ff539720857e0c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Do pixel conversion on the pixmap decoder thread when possible

Change-Id: Id991bee5c0a8b260fc1ca4395402970c6a722b5d
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Doc: corrected reference to snippet in imageparticle.qdoc

Task-number: QTBUG-29101
Change-Id: If731480343fd4d65aa5fca5c184b03c14f2f340e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: Removed reference to QAbstractItemModel::setRoleNames()

This function is deprecated and it is recommended to
reimplement QAbstractItemModel::roleNames() instead.

Task-number: QTBUG-29456
Change-Id: Ib28759fe2349edd32a1b87bac04eb44d625d3e60
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
examples/quick/textureprovider/etcprovider.h
src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
tests/auto/quick/qquickflickable/tst_qquickflickable.cpp

Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4

Stabilize resizemodeitem test.

Resizing can take time. Instead of qWait(50)
use QTRY_COMPARE to make sure we give enough time.

Change-Id: I484eca1f4d49381913dc82f405c73de653608493
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Make sure deleteLater gets run at the "correct" time.

We have a number of places where we delete scene graph objects with
deleteLater() and change the scene graph. The timing of when the
deleteLater happens is very important as we need to complete
the updates to the scene graph first.

In this particular case, a QQuickShaderEffectSource was released,
and an update was scheduled but because animations were running we
were already beginning to render a new frame before the update was
handled, causing a crash.

The only safe place to run deferred deletes is after we have
performed a proper sync with the item scene.

Task-number: QTBUG-29485
Change-Id: I6e93d4e6276fe82d3f4c818781b188e03c46e510
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Stabilize tst_qquickpositioners

Change-Id: I41e37493d5e1a6569beb5a26d6f2033a546af4b4
Reviewed-by: Alan Alpert <aalpert@rim.com>

Fixed Canvas ImageData pixel values not being settable to 0.

Someone probably figured "since the data is all initialized to 0 to
begin with, we can skip 0 values". However, it's possible to temporarily
set a value to other than 0 and then back to 0, a fully valid use case
that we need to support.

Task-number: QTBUG-29065
Change-Id: Ia9f0803743d696ca8b9cca89c666ccba80a3abd0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Add \qmlmodule commands for QtQml and QtQuick

Change-Id: I07a961bb2c5e39bfef134264e5f24974e1501361
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Avoid swizzling on OpenGL ES when possible

Add support for APPLE_texture_format_BGRA8888,
IMG_texture_format_BGRA8888,
EXT_texture_format_BGRA8888 and EXT_bgra. The apple one acts
just like the desktop EXT_bgra one, so they need slightly
different handling than the ES extensions.

This change also has the benefit that we no longer have a dedicated
ES path.

Change-Id: Ibf6dbf7548ca16a1bada61c677181d8f809c69a2
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Use constFind instead of find in QQmlMetaType::qmlType

There is no need to detach when only checking for the presence
of an item.

Change-Id: I59a0aadb74b4613b019882bcf67e84e68df18a21
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Qml: Use QString::append(QStringRef) overload in ProcessAST::asString

Change-Id: Ifc9d276e0d4f9e2ff9a89c7edbe34a04ab080774
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

substitute fixed version numbers in qdocconf files with variables

Change-Id: If28446d2d14dde62ff662ffdd366dc6384c95326
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Fix lupdate-warning in qqmlrewrite.cpp.

Class 'QQmlRewrite' lacks Q_OBJECT macro.

Replace global-static strings by message functions.

Change-Id: I67a6fbe67575533d3ce5750d72c9d7eff06e7efa
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>

Fix lupdate-warnings in qqmlimport.cpp.

qqmlimport.cpp:738: Class 'QQmlImportsPrivate' lacks Q_OBJECT

Remove tr()-function and use QQmlImportDatabase::tr()
directly.

Change-Id: I3a1561c57a6ee90d271a6043b0175e17a7828666
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>

Fix lupdate-warnings.

qqmlcomponent.cpp:667: Cannot invoke tr() like this
qqmltypeloader.cpp:2292: Cannot invoke tr() like this
qquickloader.cpp:944: Cannot invoke tr() like this

Change-Id: Ifdd1a7b958b6af88f251e7df27eb4d4018301914
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>

Add next.png to shared qrc files

Otherwise the executable versions of the examples print errors instead
of loading it.

Change-Id: I7d370ce3ee172491c004668847cdb6d5967f2b24
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Enable sorting of opaque items again in the default renderer.

This was disabled a long while back because we thought the code was
broken, and it turned out the problem was that our sort function
had a bug. b570d384c0704ea12364e353493eeb6f1ae34cd3 fixed the
actual problem, so now we reenable it.

Task-number: QTBUG-28563
Change-Id: I4032df82a1fd4cf7f775c8c64302c18239879fea
Reviewed-by: Michael Brasser <michael.brasser@live.com>

Respect the default format from the scene graph adaptation layer

Change-Id: I080c25ed8b8cc8b743043b5aa348927749c1f0eb
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Warn if the OpenGL context lacks depth/stencil when requested.

I thought this was a serious bug in the renderer, but it turned out to
be qmlscene just overriding the surface format without requesting the
needed depth and stencil buffers. An easy mistake to make, hence
introduce the warning.

Task-number: QTBUG-29037
Change-Id: I59d09d1b2a139e3add851777ff2eeb6c4efb47ec
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Add ETC1 texture provider example.

This code was removed as a labs import in commit
732a86a11dbc20079e33c289af72762ce0125ced. Bring it back as an example.

Change-Id: I057d721117dc75256c4a7229c4f8fad8dc9ac6b2
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>