Remove DIALOGS_MAJOR_MINOR define in QtQuick.Dialogs code

It's unconvenient with it to extent Dialogs to multiple versions.

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

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

Change-Id: Idaaeba880a175166437e2a7266716c776c4483c6

Window example: delay showing the splash until Component.onCompleted

Otherwise it will have the wrong size on KDE.

Task-number: QTBUG-32223
Change-Id: I3ed92ff8aead5c6e5a37a5189c7103a5383087ae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Add a unit test for testing Qt in its install location.

Change-Id: Ide70affa28f0ec37535b5a4ce1bcafac8ac58351
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

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

Don't assume that the last step of the XPath is an element name

In order to find the number of items in the model, the model did a
second query on the document representing the result set.
So, suppose the user queried for //a/b/c, the result set would contain
all the 'c' elements from the input document.
In order to find the number of items in the result set, it did a second
query with the expression  "count(/dummy:items/c)", where 'c' was
extracted from the last step in the original XPath expression

For simple expressions, this worked fine.

However, if the last step had a predicate such as "//c/parent::b" it
didn't work.

The solution is to not filter *again* the last step when we query for
the count, since we know that all result items are direct children of
"dummy:items", and instead just execute the query
"count(dummy::items/*)".

This should also potentially improve performance.

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

QtDeclarative: Removing parallel_test from config

tst_qquickvisualdatamodel and tst_qquickpositioners have been failing
recently on CI. One can't reproduce the failures locally unless
running the tests parallel, like CI does.

Task-number: QTQAINFRA-705
Change-Id: I09a9123d045f2213af915518917ce622b33b27ba
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

Added ApplicationStateChangeEvent handling to QQuickApplication.

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

Docs: restore missing ListModel methods

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

Fixed typo 'backens'

Change-Id: I65e4492d1bc70e5344c0edc37a7c2f87fe355e62
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>

Update snap when snapMode changes

Task-number: QTBUG-32258

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

Fix typo in Graphical Effects documentation.

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

Fix Qt.application.xxx notifier signals

QCoreApplication now provides change notifications.

Change-Id: Icd7e1247426f4b5ad124d6d9b72a2ba99225ee08
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

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

Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933

qmlscene: ensure that the window & component get destructed

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

Remove objectlistmodel.qmlproject file.

The example has C++ source code and cannot be run
as qmlproject.

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

Item views: do not track the geometry of items being removed

Task-number: QTBUG-31873
Change-Id: I4230893ccb2925ed9c2429d26b411264bf7c1c65
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>

QQuickTextEdit: move QSG* members from dptr to root node.

Subclass QSGTransform node for our use case and add the frame decorations
and cursor nodes in there.

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

Doc: Fix documentation of ownership of in QmlComponent::create

Fixes documentation introduced in b1ee75d377fc9517d6 : Actually the
ownership is _always_ transferred to the caller.

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

Fix access to invalid memory in ~QQmlEnginePrivate

~QQmlEnginePrivate tries to set incubationController->d to 0. However,
we're already setting the backpointer (q) of incubationController to 0
in ~QQmlEngine, so that the IncubationController destructor might run
in between without being able to reset incubationController.

To fix this, just handle the unsetting of incubationController once, in
~QQmlEnginePrivate.

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

Initialize m_dirty_texture member

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

Fix warning about change of sign: glyph_t is unsigned

qsgdistancefieldglyphnode_p.cpp(222): warning #68: integer conversion resulted in a change of sign

Use the value 0, which is reserved to mean "no texture"

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

Fix missing QQuickTextDocument docs

It didn't appear in the docs at all. Moving the documentation to .cpp
fixes the problem.

Change-Id: Id9741bc6dab20ba976952143160d3551787fae40
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Debugger: Remove handling of QT_DECLARATIVE_DEBUG macro

This was added originally to keep older Qt Creator versions working.
However, any newer versions automatically set QT_QML_DEBUG too, and
checking for both actively prevented selectively enabling QtQuick1 or
QtQuick2 debuggers only.

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

Disambiguate name of static helper from QtQuick1

Change name of static 'qmlEnableDebuggingHelper' variable to disambiguate
it from QtQuick1 variable with the same name.

Task-number: QTBUG-31064

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

Document public members of QSGSimpleMaterialShader

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

Mark tests tst_qquickloader as insignificant due to random failures

Task-number: QTBUG-30721

Change-Id: I540848b1e7c9992e89b6df2417c37ce5e81423c8
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Add bool QQuickKeyEvent::matches(QKeySequence::StandardKey)

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

Relayout the text after the vertical alignment is changed

In the designer it is no working without a layout update.

Task-number: QTBUG-32041
Change-Id: I2276914c81b38ad8931109b3d800b65a0d11bca7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>

Only emit moving change signals when moving actually changes

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

Example for running animations on the render thread

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

Add Qt.application.organization/domain

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

Document QWindow::alert() in Qt Quick.

Task-number: QTBUG-32069
Task-number: QTBUG-30416

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

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

Change-Id: I140852ef7fbbfe303dac620af5e6eba5ee3a4b02

FileDialog.folder property should also be a QUrl, for consistency

In QtQuick we never use plain file paths, because URL is more general.
Also use const references for string and URL setters, and fixed the
dependency between the FolderListModel's folder, the field for editing it,
and the folder property of the AbstractFileDialog.

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

QtQml: document QQmlExtensionPlugin::baseUrl

It was added here https://codereview.qt-project.org/#change,47532
without documentation.  Also updated \since because for now qdoc
seems to interpret \since 5.0 as QtQml 5.0.

Task-number: QTBUG-31928
Change-Id: I652e9471f1ad8e83b355bffc8498a6565dc9aa2b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

QtQuick.Dialogs: sync the docs with the implementation

We've been using URLs instead of strings for some time now, just
forgot to change the docs until now.

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

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

Change-Id: I59f34fafd795694981dd1edffca1d322657f1ae6

Switch to non-streaming version of qWarning()

Allows us to drop the qdebug.h include in a public and frequently used
header.

Change-Id: I2cb05fbec6298ba600020db684e9eea4093ce663
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>

Undo presumably accidental line deletion

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

Request paint if scene changes for the canvas item

Otherwise for every scene the canvas is simply not painted anymore in the
designer. For example if you change the parent.

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

Doc: Setting navigation variables for Qt Quick Dialogs

-for the navigation bar

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

photosurface: add C++ boilerplate launcher; open button

Creator refuses to build it for Android otherwise, and this is a good
demo for tablets.  Also added a button to re-open the FileDialog.

Task-number: QTBUG-31898
Change-Id: I9f90de316fcaa2679484f8a875737ffafa774f31
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>

Declarative dialog improvements for the non-Window use case

Platforms like Android and EGL don't support multiple top-level
windows, so we have to avoid trying to use widget-based dialogs
(because a widget dialog on top of a scene graph will result in a
second window), allow the QML dialog to be an Item, and decorate it
to look like a window.

Task-number: QTBUG-31898
Change-Id: I9af049f3265188e8be677a05a8bc6d1699b4cd00
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>

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

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

Change-Id: I6e060496b8c252fb4e2d5d2d40ae16bf950e2ec4

QQmlTrace: getpid() requires unistd.h

Doesn't build on MacOS if you omit this include and uncomment
define QML_ENABLE_TRACE in qqmltrace_p.h

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

Add "showFiles" property to FolderListModel

This property, if set to "false", causes the FolderListModel not to show
regular files. This can be useful when someone wants to list only the
directories; for instance, one can have a ListView showing only the
directories (with "showDirs: true" and "showFiles: false") and another
for showing the directory contents ("showFiles: true" and "showDirs:
false").

Since by default this property is "true", the behavior of applications
who don't use this property is unchanged.

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

Update 5.1.0 changelog and what's new

All the new features should now be listed in those two documents

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

Improve QtQuick Item Anchors documentation.

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

Doc: Adding landing page names to navigation variables.

-used by the navigation bar in the HTML output

Change-Id: If4689381fb01c0a6fe8adbd966ead1377942a101
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>

Tidy up Context2D transform-related documentation.

Also adds back some images that
61d35829eed6661c1371d397bbb316ea2f636c50 removed
(4a5d31a56dfd871f3f7c5ce162885ebc870b8803 specified the wrong paths to
all but one file, which is probably why they were cleaned up).

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

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

Change-Id: I444ed90a02eebe1f68cfa48be5d75544123ab10d

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

QQmlPlatform: rename "mac" to "osx"

Change-Id: Ie458690b8008b211785cf9dcc0312a7e25c84f6b
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

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 Q_REVISION

This invokable method is new in Qt 5.1/QtQuick 2.1

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

Add missing null check to QQuickTextEdit::hoveredLink()

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

emit runningChanged when AnimatedSprite stops by loops settings

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

Fix some Canvas/Context2D documentation issues.

Task-number: QTBUG-23597

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

Revert "Cut performance cost in QSGContext::prepareMaterial()".

This reverts commit 0e9cd8b4098661bf611fa73a787c58c85e7d7338.

This optimization breaks ShaderEffects with changing fragment
and vertex shaders and needs some more thought.

Task-number: QTBUG-31837
Change-Id: I1abe249c65dd785825c249a7c22baee928bd76c8
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

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

Change-Id: I5cc2cacd26004ba18f0c6214759f5e073b5c6cfb

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

Change-Id: I6bd61ebda17c34f51a4c4ece4852ab144bf542a6

QColorDialogHelper: Force QWindow before setting flags

This needs the same fix as the one in the QFileDialogHelper (change
I7a3b2321f4a1bf179dced8e98598559f396386db).  However to be even safer,
we can check for a null pointer before calling any methods on the
QWindow.

Task-number: QTBUG-31834
Change-Id: I319326f06fb2c92dc898fd12be86b6c7b7f87e5a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Doc: Changed the title to avoid name conflicts and linking errors

Task-number: QTBUG-30173

Change-Id: Ibf6626cdfc205c48ca634491661c87414bbddf24
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

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>

photosurface demo: behavior depends on initialization order

The file dialog wasn't appearing on the mac.  This way seems to work.
We have a long-term bug here but this workaround will look better for
the release.

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

stabilize tst_touchmouse.

The test relies on window activation, which means that it
cannot be a parallel test.

Change-Id: I15b1c1511c38345b160aa3d01d17667dffc58c87
Reviewed-by: Sergio Ahumada <sergio.ahumada@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>

QFileDialogHelper: Force QWindow before setting flags.

Fixes a crash when clicking the dialog icon in the
QtQuickControls gallery example.

Change-Id: I7a3b2321f4a1bf179dced8e98598559f396386db
Reviewed-by: Shawn Rutledge <shawn.rutledge@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

move quick dialogs example into an artificial subdirectory again

The trouble with Id28d5718b4b7b475dcd7d62e31c4634219dc3ddc is that
the build assumes that all example directories are subdirectories, so
the examples-manifest.xml will point to the wrong place and creator
ends up not having the example on the welcome page.  That's more rigid
than it should be, but we might as well use the opportunity to
distinguish system dialogs from any QML-only dialogs that might be
added to this module later on.

Change-Id: I6e7261e096d75df560c6ce608af4c54b82e52d13
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

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>