Correctly parse Context2D font as per CSS shorthand font property

Task-number: QTBUG-31721

Change-Id: I6a6ba99ed29392fa7ed67f6a3dba567947f9c46b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Add missing null check to QQuickTextEdit::hoveredLink()

Change-Id: Ie0cb144bb5596f566584b8bb80e334983dd2b50e
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

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

Change-Id: I5cc2cacd26004ba18f0c6214759f5e073b5c6cfb

fix case insensitive issue with image provider id

Task-number: QTBUG-31614

Change-Id: I866df6e3ed6226b443640a51f66a3dbb92b31249
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Remove use of 'register' from QtQml.

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

Add QQuickText::hoveredLink

Task-number: QTBUG-30804
Change-Id: I6c6993b152285f4bdf34d6e1aa04f25fa7ca41e0
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Fix dead lock when showDotAndDotDot is set to FolderListModel

Task-number: QTBUG-31687

Change-Id: Iaec798018f54f80c67fe5a06defee73ab7b79605
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Prefix internal classes properly and private export them.

Without the private export on these classes, the private
export on the QSGDefaultImageNode and QSGDefaultTextureNode
is useless, as the symbols fail to resolve

Change-Id: I25a265a7669e5f5015c482aa24fe154c2c9a1062
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Set default font size to 10px as per spec, not 10pt.

See: http://www.w3.org/TR/2dcontext/#dom-context-2d-font

Also removes duplicated assignments that are done as part of the
default constructor.

Task-number: QTBUG-31716

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

Fix QQuickTextEdit::hoveredLink

Task-number: QTBUG-31646
Change-Id: Iae4f664ed919f535511f635f2e4ab1006e3c28e5
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Graph example

Change-Id: I4a7b52f6e14182aed31354dc3860ef187e1899a4
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Allow floating point pixel sizes for Context2D, don't set if invalid.

Currently, setting a floating point pixel size for context2d's font
will result in the following error:

QFont::setPixelSize: Pixel size <= 0 (0)

This is because qt_font_from_string() uses toInt() to convert
the number to an int, which fails because of the decimal fraction.
The font size is then set regardless (to 0), which does not comply with
the standard:

"[...] If the new value is syntactically incorrect (including using
property-independent style sheet syntax like 'inherit' or 'initial'),
then it must be ignored, without assigning a new font value. [CSS]" [1]

This patch makes qt_font_from_string() call toFloat() on the string and
then casts the value to an int. I could not find any evidence that
floating point pixel sizes are disallowed, and QFont only deals with
integer sizes anyway.

If the conversion to float fails, the font size is not set (it defaults
to 10px, according to [2]).

[1] http://www.w3.org/TR/2dcontext/#dom-context-2d-font
[2] http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-context2d.html#font-prop

Change-Id: I6204eaa9fb6048bb9c4452403c3a4cf2913a03a1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Add --noinstantiate to qmlplugindump

This flag allows you to run qmlplugindump on plugins which cannot safely
create objects, such as plugins with unusual requirements or missing
essential dependencies.

Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
(cherry picked from commit 0462193b6fb97fbe7ccde496c33d82d4d5fce8c0)

Change-Id: I0d1ff7f94e00a8aab94c0aff012d78db5193400f
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Our Context2D::clearRect implementation was a bit clumsy

Change-Id: I273dd5eb73dce07a9ca0a1ac72a0780b0393603a
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>

Don't show a negative size canvas.

This is in line with how Rectangle and Image elements
also behave.

Change-Id: I82cd6ecc6d233645bb3fd968f0f81218188a8991
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>

Fix resizing canvas with renderStrategy == Cooperative

updatePolish() called prepare() which would use a queued
metaInvoke() to change the size of the texture. However,
there is no guaranteed event processing on the render thread
between polish on the GUI thread and sync on the render
thread, we would very often get to updatePaintNode() before
the queued invoke landed, resulting the drawing being done
to a texture of the wrong size.

Fix this by calling prepare from updatePaintNode when
in CooperativeMode so that the autoconnection becomes
a direct one and we get prepare and flush processed in
the right order.

Change-Id: I0fa4687a94ada4bdaddca19133e686bca0bc745c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Image docs: fix the default alignment & snippets to match screenshots

Change-Id: I8e72b58f5b3fed856d68e7a9284c828ae129f619
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

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

Change-Id: I045587eac266e9b6296d9cd9e3c73031fe18bbd1

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

Change-Id: Ie916db2bc4973016541176363d08c5dd14ff6b69

Support unaligned QImage strides in QSGTexture

If a QImage has a different stride than its width, copy the image to
relayout the memory for compatibility with glTexImage2D().

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

Fix -Wpedantic warnings

Don't need these extra ; and give warnings with -Wpedantic

Change-Id: I877fee2a6421b1aaa97ca3845a09d70f3b2b302b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Add QQuickTextEdit::append()

This makes it possible to append text more efficiently than
appending to the text -property, and also avoids weird rich
text formatting issues with the latter approach.

Task-number: QTBUG-31575
Change-Id: Id621773588b94e36f8f0b9eb6b22590e9db62811
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

Clean up qt quick dialogs example again

I5245a6931606673733130b1f168fddafe8def695 took us the wrong direction:
the intention was to put ALL dialogs in one example, because each
example has some overhead (project, docs, screenshot, c++ launcher)
and we don't want to have several more separate examples after the other
dialog types are added.  Color and file dialogs have no relationship
to each other except that they happened to be implemented first.
This is analogous to qtbase/examples/widgets/dialogs/standarddialogs
And in fact, each dialog type is in a separate qml file, so you can
run them individually with qmlscene anyway, which will keep this
from becoming unwieldy and hard to understand.

Change-Id: Id28d5718b4b7b475dcd7d62e31c4634219dc3ddc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

Make qtdeclarative compile with QT_NO_NETWORKPROXY

Change-Id: Ie7bf1e1d15da323f901f2c6b851a7b1e8ae0d832
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Ensure the vertical text alignment is updated when the Text height changes.

Task-number: QTBUG-31647

Change-Id: Ia0968a7a40c40411df5b3ed841a42f6cef141525
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Vesa Halttunen
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Document drag-threshold behavior of Flickable

Task-number: QTBUG-31168
Change-Id: Ia9452ad9f548b5eb9684603b4ab8b10f35710eae
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>

Make qtdeclarative compile with -no-gui

Change-Id: I0c5a55c8f6b78450b2bce693bb55e12f8a224172
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

prepare for qt_module_pris.prf changes

Change-Id: Iba75fccfc143f09d443d50bc8dc75cde5739af9b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Fix compiler warning about unused parameter

Fix gcc compiler warning about unused parameter:

qquickwindow.cpp:111:10: warning: unused parameter ‘e’ [-Wunused-parameter]

This got introduced by commit 9d75626b

Change-Id: Ia280fd9fdd584eed81f4d810311c56f5daee3e28
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Doc: Exclude Qt Quick Dialogs examples in qtquick.qdocconf file

Qt Quick Dialogs has its own .qdocconf file where the example path
is defined. This change removes the path from .qdocconf for Qt Quick
module so qdoc doesn't try to parse it twice.

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

support url type qml property as a source for Context2D::drawImage()

Change-Id: I66445dafd64f6c47fe1098fadd83bf3af301e58d
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

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

Change-Id: Iafc0497812acb7850cd4e72c49d63ec9c9320b58

fix Folderlistmodel "showDotAndDotDot" didn't show "."

Task-number: QTBUG-29858

Change-Id: Ia736776e2587601a80d0aef22bb5cfce74040d39
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Doc: fix since QtQuick 5.1

Change-Id: I87a108e817caa06c73620dde0ba68b3c66a134c9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Autotest: Update textedit test using textFormat

TextEdit does not support the StyledText format, Text does.

Add an autotest to Text to check the line counts using
different text formats.

Task-number: QTBUG-31191

Change-Id: I4670f9155bea295ba85f410988d9636eac12842c
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Reviewed-by: Liang Qi <liang.qi@digia.com>

Add QQuickTextEdit::hoveredLink

Change-Id: I9d75a97c86e047742514f942cdb91c70f1d7a9a2
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Fix null-pointer access in QQuickVisualDataModelPrivate

I observed null cachItem->contextData which lead to null-pointer access
on cacheItem->contextData->destroy().

Task-number: QTBUG-31439

Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Add future compatibility note

File selectors are being delayed from releasing at the same time as
QQmlApplicationEngine, but will need to be enabled by default
(in QQmlApplicationEngine only) when they do arrive. Adding a note to
the documentation to help forwards compatibility.

Change-Id: Ia47a1da1afebd0da3bd1a97e7e4c8ee85f70b49a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Set incubation controller when a Window{} is loaded via QQmlApplicationEngine

This was the one convenience that was lost when transitioning templates
from QQuickView + Item{} to QQmlApplicationEngine + Window{}.

As the default window incubation controller was tied to the first
window's frameSwapped, we could easily run into a situation where
a secondary window required incubation while the first window
was idle. This would then starve the incubation controller. Instead
make it so that the renderloop emits "timeToIncubate" once it
is done with a renderpass over all windows, so the incubator
gets to run once and exactly once per vsync when animating.

The incubator logic was also flawed in that it could post
a lot of events to itself as a result of incubatingObjectCountChanged
and thus starve system events while processing incubation requests.
Now we start a timer and don't start it again until we have
completed an incubation pass.

Task-number: QTBUG-31203
Change-Id: Iea9e2c81efb46bb7875c70ccda0cdc4b3b3e58e7
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Fix -Wpedantic warnings

Don't need these extra ; and give warnings with -Wpedantic

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

Doc: Clarify object ownership of QObject* returned by QmlComponent::create

Link to relevant section in QQmlEngine::ObjectOwnership. It's a big gotcha
that a QObject * returned by a Qt method won't be deleted eventually, by
default.

Change-Id: I2367b7ae2673adc7fa181b759c79683091020462
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Fix setRequestHeader to only append to headers added by user.

This causes no behavior change. The reason for this patch is due to a planned
change in QNetworkRequest that causes default headers to be added on creation.

Change-Id: Ic233a12eb0aa35475300d65738ee26872349518b
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

Make TestHTTPServer header comparison order independent.

The order of headers in an HTTP request is irrelevant and program
behavior should not depend on it.

Change-Id: I77e1b6265ceed8a38f04e425ba8e6eb70b5227f1
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

Doc: Fixed link to Qt Quick Layouts and made links consistent

-better to use the "QML Types" pages as the version is not specified.

Change-Id: I5b150bc8ada25c619dbecb5d68e70854dd9c14d6
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

add missing dependency check to widgets plugin

QtQuick widgets plugin depends on both QtWidgets and QtQuick module, if
do not check 'quick', there will be an error: "Project ERROR: Unknown
module(s) in QT: quick" when running make if failed to check for QtQuick
module due to no opengl/es1/es2 found during config test.

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

Doc: Fixed QCH listings for Qt QML and Qt Quick Dialogs

Qt QML: added QML types page as a child in the list
Qt Quick Dialogs: "manual" as type taken out

Change-Id: I95d77b7582a0f5729801e1e6fb8f5f3242a0b760
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

doc fix

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

Fix compilation of QML benchmarks

Change-Id: I2d612108ec8d69a0a9318cd26f6adcbb74f34138
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

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

Don't remove milliseconds now that toString() includes them.

This patch fixes a test failure introduced by
15da0a5af20fe6771bcb94ef8d46edbd5c8fb64c.

tst_QJSEngine::dateConversionJSQt and tst_QJSEngine::dateConversionQtJS
removed milliseconds from the JS-converted datetime, as
QTime::toString() previously did not include them. Now it does, so we
can remove this code.

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

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

Conflicts:
.qmake.conf

Change-Id: Ib8b5509c48a686f6e916708d83914e13e4f67e9c

Doc: Update Qt Quick Controls description

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

Stabilize tst_qquickanimatedimage::mirror_notRunning()

Task-number: QTBUG-31370
Change-Id: I200d94dccd1314c891df92576b0d2b704e530e16
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

qmlscene: if top-level is a QQuickWindow, set incubation controller

The necessity for this is documented in the
QQuickWindow::incubationController() accessor.  Bug 31203 is about
writing a custom main() with a QQmlApplicationEngine, not about
qmlscene, but the same workaround is necessary for both.  Hopefully
soon we find a way to make it unnecessary, but for now it is.
This fix also doesn't take care of the QtObject { Window { } }
use case.

Task-number: QTBUG-31203
Change-Id: Ic9a5e4a23ac918593138dc9cab3de6cd36453eaf
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Doc: Clarified members of QtQml.Models submodule.

-Took out  members of QtQml.Models submodule from Qt QML and Qt Quick.
-Set up qdocconf files to include QtQml.Models to be part of Qt QML
 doc build.
-Edited the sentences to make it clearer that list and model types
 are in QtQml.Models.
-Placed the Visual* types back to QtQuick 2 module.

-This patch removes several collision pages.

Change-Id: I16e7045162af6852e5d6c3162b6f4cf97a42402b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Update Changes file

Mention the behavioral change introduced by the fix for QTBUG-29836.

Task-number: QTBUG-29836
Change-Id: I15ffd32fd5c0d537528f7b1386691103dab371c7
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

QQmlPropertyCache: check methods before properties

When creating the QQmlPropertyData, search within the methods list
before searching for properties. The reason is that if the meta object
is dynamic, looking up a property will always return a result (if the
property doesn't exist, it will be created) and therefore all methods
will be obscured.
By swapping the search order, we eliminate this risk (methods are not
dynamically added).

Task-number: QTBUG-29836
Change-Id: Ie367f757c37ef4bc834a6c1c009f27bcf344fe76
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Fallback to QMetaObject for properties not in QQmlPropertyCache

QQmlOpenMetaObject does not update the QQmlPropertyCache when new
properties are added, meaning that the QQmlPropertyCache might not
contain all of the dynamic properties of an object. Therefore, make
QQmlPropertyCache fallback to reading the QMetaObject when a property is
not found.

Task-number: QTBUG-31226
Change-Id: I760aaa155b1952f6f52ab9ce173fb9547f8e34a6
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Deprecate the with statement in QML

It is generally considered deprecated in JavaScript and its use disables
a whole range of optimizations that we would like to apply in the future.

Therefore this patch will issue a warning if the with statement is detected.

This change is also documented, along with the plan on enabling strict mode
in the future.

Change-Id: Ie60f0536e0bdd6ecc537d8e34efbd8868bcad743
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

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

Change-Id: Ie4ce4c3e64f093eec26754e06199d350a46ae2a2

Stabilize tst_touchmouse

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

Precompile the most common materials

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

Fix assert when calculating the implicit width of truncated lines.

Guard against reading past the end of the final line.

Task-number: QTBUG-31471

Change-Id: I489f742936ee16f12ad9762b7c0891bfa9377e21
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>

Do not use QApp::arguments() to select antialiasing mode.

This selection typically interfers with an application's command line
arguments. Creator's qml2puppet needs to set this mode to avoid
getting subpixel antialiased text from DesignerSupport.

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

Change wording in QML Tutorial.

Task-number: QTBUG-25595

Change-Id: I38b227ac2652d2b04d3d1e00f397d189a9de4bed
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: Fix the positioning topic page

Mention both Positioners and Qt Quick Layouts.

Also add qtquickdialogs to qtquick.qdocconf.

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

Added QQuickWindow::setDefaultAlphaBuffer()

All QQuickWindows will render using the same OpenGL context, so
for a window to support transparency, the OpenGL context needs
to be created with support for transparency from the very start.
Therefore the application needs to call setDefaultAlphaBuffer()
before creating windows.  There are some relevant comments in
QTBUG-20768 although the bug itself is not the same use case
(it was already OK as long as the first window had a translucent
color, because of setAlphaBufferSize in QQuickWindow::setColor()).

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

Fix various bugs in calqlatr

It's still not a great example but at least it's somewhat usable now.
- added files to .pro so you see them all in Creator
- keypad is fixed size and the "tape" takes up the rest, so you can
  resize the window to be able to see long numbers
- you can flick the ListView (MouseArea not on top of the whole thing!)
- ListView scrolls to the bottom when you add numbers past the point
  that scrolling is necessary to see them
- Clear, sqrt and +/- keys are functional

Task-number: QTBUG-26556
Change-Id: I485e4123ad6c24ca64bad3efc3acfc14587268d8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

window example: show only the splash screen until the timeout

The window takes time to resize itself; we can avoid letting the user
see that by delaying visibility of the main window.

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

Doc fixes to the Positioners/Layouts documentation

* Add references to Qt Quick Layouts
* Don't lie about that Positioners can resize the items
* Rename title from "Item Layouts" to "Item Positioners" to avoid
  confusion with Qt Quick Layouts

Change-Id: I43e3ad6e6d9e4b08a1233868c75f0efcab43f8c3
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: Added Qt 5.1 details in Qt QML's release notes.

Change-Id: Ie5a4199563b22c21d7be009aeb85206670b84642
Reviewed-by: Martin Smith <martin.smith@digia.com>

Bump MODULE_VERSION to 5.1.1

Change-Id: I650117a0e0d35be84dd96dc2886cce157b7c921c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Add --noinstantiate to qmlplugindump

This flag allows you to run qmlplugindump on plugins which cannot safely
create objects, such as plugins with unusual requirements or missing
essential dependencies.

Change-Id: Ifcc542b8dec5358fc8a76d78a2a272c9cbf5d78a
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Doc: Fix links for ListModel and ListElement types

Link to documentation under QtQml module.

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

Doc: Fix various problems in Qt Quick Dialogs documentation

This change fixes the following things in .qdocconf:

    - CamelCase for project name (required for generating valid tags
      in example manifest file).
    - Proper selector for QML Types topic
    - Fix exampledirs to not pull in all the Qt Quick examples
    - Add examplesinstallpath to make Qt Creator see the examples

Also fixes the paths in example docs according to changed exampledirs.

Change-Id: If18f7b5a3160d85814d508e1cbfb7bdb1a002c54
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

Doc: Excluded Dialogs directory from Qt Quick doc build.

Qt Quick Dialogs is separate and should be excluded from the Qt Quick
doc build.

Task-number: QTBUG-30180
Change-Id: I6e63efc071d8d2e5673745f0dcd97d5b5f562d25
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

Make sure tryCompare value argument is not undefined

It happens often that people convert a
compare(foo.bar, 3)
to a
tryCompare(foo.bar, 3)
and unfortunately that succeeds but doesn't do what they expected

This makes tryCompare fail if no third argument is given

Task-number: QTBUG-31427

Change-Id: I0c9618dae9aad4be55aa35c3e2dcf3535728beaa
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Animations: Avoid accessing invalid memory if stop() triggers deletion

Return immediately if calling stop() results in the current object being
deleted.

Task-number: QTBUG-31247
Change-Id: I684a858bfb4cc53f415daa8cc1c4df96067daa1c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Dialogs: Create directory structure for documentation

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

Do not draw negative-size ShaderEffect(Source) items.

We were a bit inconsistent here. A negative size Image element would not
render at all, a negative size ShaderEffect would render mirrored
and a negative size ShaderEffectSource would trigger an assert.
Be consistent and not draw any of them.

DropShadow from QtGraphicalEffects uses both a ShaderEffectSource and
a ShaderEffect together, so keeping the behavior in ShaderEffect
would make it render incorrectly.

Task-number: QTBUG-31383
Change-Id: Ied5568d7edbc2aed96b00adfdc6aae09b6f2a7d9
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>

Accessibility: Fix crash when accessing accessible children.

The window would create new child interfaces every time
it's children are queried. Instead properly use the
crash.

Task-number: QTBUG-31417
Change-Id: Ifc7bbdbdb9a506fe04a348fba643f1d52a6157e7
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>

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

Conflicts:
src/quick/doc/src/appdevguide/porting.qdoc
sync.profile

Change-Id: Iec5516c596c3eca60a3e6ceb1d45f2a7a1595c12

Package dialogs examples into a single executable

Introduced tabs and added the C++ boilerplate launcher.

Change-Id: Ibb49a182e3928aba5dced097d5307eb7d1f4b42d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>

window and Screen example: new properties; splash screen

Demonstrates the new properties, how to make a splash screen, and
how to make a standalone app with an icon.  Combined the Screen info
into this example too.

Change-Id: I5b731539b39c55327f4e5b93860a880a35835896
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>

Prevent tab focus from wrapping endlessly

If there was no item that accepted focus, it would go into an
endless loop.

This also changes the default behavior of QQuickWindow. When there is not
any activeFocusItem in the whole window, it means the contentItem got
focused. The Tab/BackTab key will now focus the next item in the tab focus
chain.

Autotest is included.

Done-with: Frederik Gladhorn <frederik.gladhorn@digia.com>
Task-number: QTBUG-31344
Change-Id: I854292f89a327c493eec21969907c94aa9cfddcb
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

Doc: Added Qt 5.1 information in Qt Quick's release notes.

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

Doc: Add Qt Quick Dialogs to Qt Quick submodules list

And add a landing page for Qt Quick Dialogs.

Change-Id: I0c2611bf5cdbf9937b4fd94228915553d8b3bb77
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

sync.profile: Point dependencies to an empty string

This means that we are going to use the same branch name for the
dependencies as the branch of the repository under test.

If we are testing the 'stable' branch, all dependencies will point
to the 'stable' branch as well.

Change-Id: I0959eea83b620af805b2113422bae5ae306af120
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>

Update all plugins.qmltypes files

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

skip failing qquickanimatedimage mirror tests for now

Failing on mac, which is a blocker for CI.

Task-number: QTBUG-31370
Change-Id: Icb42bb5ae59510a8754de895070d7a3d08af2623
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Doc: Add Dialogs/Controls/Layouts in submodules section

Change-Id: Ide4afaa74d73ea09cf329de593283c269ecdacb3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

QmlProfiler: fix SceneGraph profiling

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

Debugger: Make sure client list is protected by mutex

So far we didn't protect this access.

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

qmlscene: Set window flags correctly.

Task-number: QTBUG-31258

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

Do not return cacheItem->object if it is still incubating

It can happen that cacheItem->object in QQmlDelegateModelPrivate::object
already has a value but that the cacheItem->incubationTask is still
Loading. If we return the object here we can confuse some of QQmlDelegateModel
consumers like QQuickItemView.

E.g. in QQuickItemView if we get to return the object before the createdItem
signal is emitted we will make that when the createdItem signal happens
QQuickItemView::createdItem will be called it will add the item
to unrequestedItems items and will expect that layout/refill will
remove it from unrequestedItems if it is really one of the items we are
creating, but as it has been already created the item will wrongly remain
in unrequestedItems making the item view to act weird

Task-number: QTBUG-28403

Change-Id: I4359391eb2a4012afd3f01d082a99692d63b6639
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Cut performance cost in QSGContext::prepareMaterial()

The hash-lookup in this function is costing us a lot, and
since we're looking up the same materials again and again,
and the material has a place holder for it, we can store it
directly in the material at no extra cost. This was a 10%
gain in this particular benchmark.

Change-Id: I46b67791ce39f453fa86d1ee82f6f5c7785b46a1
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

add private export to image and rectangle nodes

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

qmlscene: don't call show() on the window if it's already showing

That way Component.onCompleted() can optionally do showMaximized()
without being overridden.

Task-number: QTBUG-31260
Change-Id: I6f5c3025efd3b38809be85da4172241695168a6c
Reviewed-by: Nikita Krupenko <krnekit@gmail.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

Partial fix for deferred properties when combined with components

Current deferred properties implementation did not store context
or compiled data pointers correctly. Those pointers are now stored
when the defer is reached, so as to avoid confusion (confusion leads
to asserts or crashes).

Does not extend the deferred property support to allow multiple
deferred blocks per item. This now prints and error and the side
effect is only that one of the deferred blocks is lost. This use
case is sufficiently rare that it may not be worth the cost.

Task-number: QTBUG-30325
Change-Id: I80cb074ed4452e95020208a0142a91e721bced7d
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Fix TextEdit content size calculation

Task-number: QTBUG-31154
Change-Id: I9d3e31352967b99b4bbb38f5819d3d093438ee37
Reviewed-by: Caroline Chao <caroline.chao@digia.com>