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>

Use the optimal image format for the sprites

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

Dereference the QImage once the corresponding texture is bound.

We do not require a reference here, as the texture is only bound
once. It is the texture factory that is reused (when
QQuickWIndow::setPersistentSceneGraph(false) is set and the window
is hidden and then re-exposed). With this patch it becomes trivial to
create a custom QSGContextPlugin with a texture factory that does
not retain the QImage, freeing up memory. This is useful in the
case of an embedded system with only a single window that
is never hidden or re-exposed.

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

Stabilize tst_qquicktextinput::remoteCursorDelegate()

In some cases QCOMPARE(component.status(), QQmlComponent::Loading);
(line 2800) is failing -- it appears to be Ready immediately. Add a delay
to ensure it always hits Loading before Ready.

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

FolderListModel: use QDateTime for file times

Make the "fileModified" and "fileAccessed" roles return times as
a QDateTime, and not as an already formatted string.

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

Ensure the cursorRectangle is updated as the width of the text changes.

Outside of when of a monospace font is used, if the text changes the
visual position of the cursor will have most likely changed as well
even when the cursor index hasn't.

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

Merge branch 'release' into stable

Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5

Document QQuickItem::itemChange and QQuickItem::window() properly

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

Reenable tst_QQuickItem::simpleFocus and fix warnings.

As a result of 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763,
the simpleFocus test now passes on Mac and can be reneabled.
I also took the liberty of making sure windows have a valid
geometry, so that we don't get tons of warnings.

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

Window can have a transparent/translucent color

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

Added to QML_RENDERER_TIMING logic to capture most render bottlenecks.

The typical bottlenecks during rendering are usually compiling
shader programs, uploading textures and preparing glyphs,
so add profiling data around them.

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

Debugger: Remove symbian specific plugin

Symbian isn't supported any more. We only support debugging via TCP.

Change-Id: Ie7be06eeacd4206c4c14178e24c1b33d35fc8a0c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

Strengthen reference to var properties during construction

Normally var properties are kept alive by a reference to the object they
are declared on, but during the construction of that object the GC may
not be aware of said object. This change uses a strong reference during
GC passes which take place while the object is being constructed.

Task-number: QTBUG-29138
Change-Id: Ieecfcc7567aefac0d67cb933728daf16ed3eed0a
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>

docfix: Emitter.enabled was documented as Emitter.emitting.

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

Fix memory leak

The cache is filled with dynamically created entries, so clear is not
quite enough.

Change-Id: I40a49ce5d1a3d6da1b419e85cae95f2f95011a19
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>

Allow aligning items in a grid

This change introduces two new properties, horizontalItemAlignment and verticalItemAlignment to a
Grid element. This gives the user the possibility to align the items.

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

Remove QT_{BEGIN,END}_HEADER macro usage

The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Ia07e99676e0134fde5e32880edb95e57c779a7ff
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>

Doc: declarative-colors.png not visible in qmltypereference.qdoc

Copied the file from qml image dir to quick image dir

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

Doc: corrected path to snippet

Added "quick" to path in imageparticle.qdoc

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

Fix unterminated comment

Change-Id: Ic5bcbac339588fdded265a00515f768058d73870
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: Fix "Command '\li' outside of '\list' and '\table'"

It doesn't look like any list is meant to be here. All other instances
of "down" are italicized in this document, so we follow suit.

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

fix qmltest example install path

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

mark forgotten EXAMPLE_FILES

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

fix installation of qmltestcase example

split the project along the built-as-part-of-qt line:
in qt, it must comply with the installation rules for examples, and it
shouldn't be an actual test case - our CI is not supposed to run it ...
the stand-alone build (which users are supposed to make use of) needed
adding TESTDATA for proper installation.

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

Introduce a workaround for a GLSL bug on BB10

When using the sizeTable property of the QQuickImageParticles, the vertex shader is not compiling.
This is a workaround for a compiler bug on BB10.

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

Added an example of the window container embedding a QQuickView

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

Prevent possible leak with texture providers.

If the job has been cancelled, ensure we clean up the texture factory
that was created.

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

Doc: Add QML Types to table of contents in Assistant

Replace 'headerfile' with 'qmlclass' in qdocconf file.

As a positive side-effect, QDoc will also add files for 'All members'
for QML Types into .qhp as well.

Task-number: QTBUG-29226
Change-Id: I282ef42283ec147ea0f2b466b15e7f104c8a012a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>

Ungrab mouse when FocusAboutToChange instead of Leave

Commit 7b2e2117162594a2d0234bb02408f5b5a446488b
introduced a regression in mouse handling:
When moving the mouse out of the window it would cancel
all further mouse events. That is actually not wanted
(eg scroll bars).
Instead ungrab the mouse when the focus changes,
that means the mouse handling with popups works and the
scrollbar use case is also fixed.

All the tests related to this seem quite timing sensitive,
so try some more QTRY_VERIFY.
Remove the parallel_test so that more cpu time will actually
let the tests pass more reliably.

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

Move the model classes from QtQuick to QtQml

This is needed for proper support of non-GUI instantiators in QtQml.
Only private C++ classes are affected. Aside from name changes, model
classes now operate on QObjects instead of QQuickItems, leading to minor
changes in the implementation of QtQuick classes using them.

The old QML type names will still be registered in the QtQuick import
for the forseeable future, but pointing to the new classes. The new QML
types will be added in a second commit.

Classes Affected:
QQuickVisualDataGroup -> QQmlDataGroup
QQuickVisualDataModel -> QQmlDelegateModel
QQuickVisualItemModel -> QQmlObjectModel
QQuickVisualModel -> QQmlInstanceModel
QQuickChangeSet -> QQmlChangeSet
QQuickListAccessor -> QQmlListAccessor
QQuickListCompositor -> QQmlListCompositor
QQuickPackage -> QQuickPackage (just moved for now)

Change-Id: Ia19e630e53bfa9e5d459e289596cd11df1ea3930
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>

Move ListModel and ListElement to the QtQml import

They're already in the QtQml module, but were left in the QtQuick import
because they were considered to be of minimal use without QtQuick types.

QtQml types are being developed would could make ListModel useful
without QtQuick, indicating that they should no longer be considered
QtQuick depedent.

Change-Id: I31499f2cc23baf4bc70fb451ba164408bed89ff6
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>

Doc: Fix uses of \since

Change-Id: Idf497424279fbee08e6e5750e6a15372c808105f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Fix alignment of Text element with implicit size

In change e1d6b323d474acc5cd70fd9a0b283326316f55a0 there's an
optimization which disables layouts on the QTextDocument, but the
layout has to be re-enabled before we can call idealWidth() since
this will be zero as long as the page size is 0x0. We simply set
the page size to undefined again before calling idealWidth.

Task-number: QTBUG-29262
Change-Id: I6bebe7be4c99fce0de8fc4178b5e1abc81abbe87
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: aavit <eirik.aavitsland@digia.com>

Disconnect from previous loading image when loading a new image.

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

Doc: Updated change log with documentation entry

Change-Id: I1cd4dc70265f2425045328910be12a0cfaeb795c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Make HTML horizontal alignment work like in QtQuick 1

If the text width set is higher than the ideal width, there's
no risk of wrapping, and thus we align the text based on the
full width of the Text element. This matches the behavior in
Qt Quick 1.1.

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

Remove outdated macro usage

Change-Id: I4b58f3d74d7dec9a95a07b907c500990630e7762
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Refactor QQmlTypePrivate

Now has a registrationType, and an extraData union for data only
relevant to certain registration types.

Change-Id: I9b127dff7955456aacb25138fa6ea8efb7bb9220
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>

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

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

Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952

Move documentation to QtQml module

The recent move of certain elements from the QtQuick module forgot to
update the module in some of the documentation strings.

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

Fix import path of TextBallon-example.

Task-number: QTBUG-28144

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

Stabilize QQuickTextEdit test

tst_qquicktextedit::remoteCursorDelegate was failing
because the test server served the the remote file too
fast. It seems like the test relied on a slow machine to
run it.
Instead pass the Delay option to make the server serve
the file delayed.

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

Doc: Fixed "QML Types" node in Assistant

Removed "class" from the "selectors" variable in qdocconf file.

Task-number: QTBUG-29242
Change-Id: I960dcbdb22358e033177b0ccb9c211136c0e4dcb
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>

QQuickImageProvider: fixed three \snippet paths

Change-Id: I289e61c7e3acc3d7047b2b26fae624900e076586
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Clean up accessibility QtQuick example

Remove an undefined value (column.h) used in the accessibility
example and fix minor indentation and style issues.

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

Fix crash in PathView

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

Complete rewrite of threaded render loop.

This change starts using the superior implementation of the scene graph
render loop which has been worked on in the scenegraph-playground
project for a while. It uses a far more straightforward locking/sync
paradigm compared to the existing one and is less deadlock and error
prone. It also enables the scene graph thread to run on its own when
the GUI thread is blocked, enabling threaded animations.

This changes also introduces a naming change inside Qt Quick from
"Window Manager" -> "Render Loop" as that fits better to what the
code does.

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

Merge "Merge branch 'release' into stable" into refs/staging/stable

Merge branch 'stable' into dev

Conflicts:
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf

Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9

Merge branch 'release' into stable

Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8

PathCurve documentation: fix non-working example snippet

Set the contextType property in the example code that demonstrates
using PathCurve with Canvas; without it the code doesn't work.

Task-number: QTBUG-29114
Change-Id: I75be931d5a30a26efceb2c2493f5e41d092dbbc5
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>

Enable sub-pixel anti-aliasing for default builds on Windows

While ANGLE builds only provide the OpenGL ES2 APIs, it's still
a desktop technology and we should default to using high quality
anti-aliasing.

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

Avoid race condition in QQuickTests

The QQuickView::show() function may or may not be synchronous and
because the rendering happens on another thread, the frameSwapped
can be emitted before we enter the qWaitForSignal() event loop.
Fix this by waiting for the window to become exposed instead, which
implies that it has rendered at least one frame.

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

Improve the look and feel of our demo launcher

The existing demo launcher looks rather ugly. This does some
visual tweaks to make it look better, including adding support
for proper text wrapping.

It was approved by our design lead Diana.

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

Do not force focus for non-focused windows.

If a QQuickWindow comes to screen but is not the focus window,
such as if it is a child window of another window, it should
not have focus by default.

Change-Id: If9015bbc179bb101178b3bc8de176a1c71c46023
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

Exporting required symbols for Qt Quick Designer

These classes are used by qml2puppet.

Qml2Puppet is an external process used by the Qt Quick Designer,
that builds the interface between the designer and Qt Quick/QML
internals.

Qml2Puppet is responsible for emulation and rendering.
The 2 in Qml2Puppet indicates that it is used for Qt Quick 2.0.

This would be nice to have in Qt 5.0.1 to allow testing based
on official packages. Also this helps early adaptors.

QQmlTimer is used to disable timers.

QQuickTextEdit and QQuickTextInput are used to disable the blinking
cursor.

QQuickBehavior is used to deal with behaviors.

QQuickPropertyChanges and QQuickStateGroup are
used to emulate states.

QQuickTransition is used to disable transitions.

Task-number: QTCREATORBUG-8572

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

Disable blending of opaque Rectangle elements

Change-Id: If456248c10c24c3d2f2a383f29e72c74d2dee8bf
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

Greatly improved Scene Graph Overview documentation

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

Remove workaround for particle shader on Blackberry

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

Disable the QQuickFlickable test in CI.

Test failures in this test has been popping up randomly in several
different changes. It is poorly written with use of qWait()'s
and QCOMPARE instead of using the more robust QTRY_COMPARE and
QTRY_VERIFY.

Change-Id: Ib56d7b2554b22fa9af767be31f1f181983ed60c7
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Make numeric-literal parsing even more robust.

The numeric value could overflow a unsigned 64-bit integer, so instead
just buffer the string and have libc's strtod handle all the conversion.

Change-Id: I220e490ddc22363460b0df65a91b47336e747310
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>