Bump module version to 5.4.0

Change-Id: Ib9c41e40478985a6c88ab81d748b2323202a202c
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iba41b4872d5cebcf0a2ad63266154fd518105e4f
Temporarily pin qtbase similar to qtdeclarative

Change-Id: I95b101670fd4f767d311ea015d0836f6d09931aa
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Fix tst_applicationwindow::test_minimumHeight()

QQuickWindow::contentItem is now resized in resizeEvent() so
the window must be visible if a test relies on content item's
size.

Change-Id: If354306d80bd2fcf47114d726fa5987c60399b2e
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Pin qtdeclarative in order to allow for the qtdeclarative stable -> dev merge to go through

Change-Id: Idceca103d6cc8e0cac254bdd2eb25be0f6bb0840
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Unpin qtbase and qtdeclarative

...both merges are already in

Change-Id: Ib6a43a88e6a10d0db0c5f471b74709ac9ee5b419
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Bump QtQuick.Window import version

Use 2.2 to get access to revision 2 signals.

Particularly interesting is sceneGraphError() which allows graceful
handling of OpenGL context creation failures even from QML, inside
the ApplicationWindow items.

Change-Id: Ie2ec98a438a05d35e4c9f9459a6ac49887147149
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	tests/auto/controls/data/tst_applicationwindow.qml

Change-Id: I2ba1f1ba9604f9417102ff076e4ab9ab4d37ab7a
Fix shaders for OpenGL core profiles

Add also a --coreprofile command-line parameter to the gallery and
systemdialogs examples to allow testing Quick Controls with an OpenGL 3.2+
core profile.

This depends on the new features introduced to qtdeclarative in
I75a47182 and I41b513e9.

Change-Id: I408263a108a71df221943915849a4c3e18e0d3e4
Reviewed-by: Gunnar Sletta <gunnar.sletta@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: Ide92e6a626be1a56b99c997b1bb4a28451eddedf
Fix typo in comment

Change-Id: Ic1fff15231907039d0130cd76e4c65e1a48f5457
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/controls/ApplicationWindow.qml

Change-Id: I2ab8efb4e04006724410da0f6ed03bd2672c5eb6
Add missing TextArea::contentWidth and contentHeight

Task-number: QTBUG-38324
Change-Id: I6cd5cab164288434e589d2b5e8c5cbfbb9bbea90
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Add TabView::contentItem

Task-number: QTBUG-38425
Change-Id: I9e2b960e9b336145388371e5cee8a8a4cb1fa38e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Add styleData.pressed for TabViewStyle::tab

Change-Id: I54a1cfa3fe3824da6b554df90c5a96fa96229b74
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Don't include the indicatorWidth twice on Checkable Buttons

QQuickStyleItem calculates the full size from the content size using the
QStyle's sizeFromContent

The QStyle will add the indicator to the contentSize. We should not
include the indicator in the contents otherwise the indicator gets added
twice.

4px of margins is added to match QRadioButton::sizeHint

Change-Id: I791b0a8585843e66a6d8af456d95652496fe94d4
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
ComboBox: let style specify a font for the editor

Change-Id: I6a65309d35ad3d50116a69b85ad88093399b0457
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Merge branch 'origin/stable' into dev

70bd266 resolves the current tst_controls failure which is blocking
qtdeclarative#dev integration. We cannot merge the latest origin/stable
yet, because that depends on the next qtdeclarative stable->dev merge.

Change-Id: I170aec576a06bc79e2df9564e8cf77a0044bd3aa
Set State_KeyboardFocusChange if focus has been requested by keyboard

Some styles (QFusionStyle, QGtkStyle) don't draw a focus rectangle if
QStyle::State_KeyboardFocusChange is not set. This patch is based on
change,84388 in QtDeclarative.

Change-Id: Ic0c0bdd68689055cff12d601e64b77b53e7980dd
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>