delta/qt5/qtquickcontrols.git, branch baserock/morph code.qt.io: qt/qtquickcontrols.git Merge v5.1.0 release 2013-07-04T08:56:52+00:00 Richard Dale richard.dale@codethink.co.uk 2013-07-04T08:56:52+00:00 acf9e50d52c4d09a1aed9490bb2f3c5de7dce9bb 






Adapt to Qt.platform.os rename ("mac" -> "osx")
2013-06-24T16:10:01+00:00

J-P Nurmi
jpnurmi@digia.com

2013-06-24T12:05:56+00:00

aa4ddfd8443f07badc0899d835027e46c6e0dfd8

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





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







Doc: Small fix for SplitView
2013-06-24T07:52:19+00:00

Caroline Chao
caroline.chao@digia.com

2013-06-24T07:26:05+00:00

f90d7eed222d65bd35730c2dd09fc68c3d67eea0

SplitView items must set width/height and not
Layout.preferredWidth/Layout.preferredHeight.

Change-Id: Ice888d51c63cbdaf6e0e235c0c7569c4a8794b7d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>





SplitView items must set width/height and not
Layout.preferredWidth/Layout.preferredHeight.

Change-Id: Ice888d51c63cbdaf6e0e235c0c7569c4a8794b7d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>







Doc: Fix QCH filter attributes for Qt Quick Controls/Styles
2013-06-18T09:10:44+00:00

Topi Reinio
topi.reinio@digia.com

2013-06-17T11:08:46+00:00

f5f818e3adfa9d39c4955ffe34443027427a7f74

Fix typos in filter attibutes, preventing filtering from working in
Assistant.

Task-number: QTBUG-31796
Change-Id: I21c91b43881cd73ae7df4203922085e7c9f93e8f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>





Fix typos in filter attibutes, preventing filtering from working in
Assistant.

Task-number: QTBUG-31796
Change-Id: I21c91b43881cd73ae7df4203922085e7c9f93e8f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>







Doc: Fix QCH documentation structure for Qt Quick Layouts
2013-06-17T11:46:37+00:00

Topi Reinio
topi.reinio@digia.com

2013-06-17T10:30:33+00:00

64f464d7641384a98f894430a7e8b71a182aaaf7

Remove 'type = manual' definition from the .qdocconf to prevent links
on the module page from being added as subtopics. Also, fix the QML
Types topic to point to the correct index page.

Task-number: QTBUG-31778
Change-Id: I3df99e0fafff4bf807b952ad4bf976e2a481221d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>





Remove 'type = manual' definition from the .qdocconf to prevent links
on the module page from being added as subtopics. Also, fix the QML
Types topic to point to the correct index page.

Task-number: QTBUG-31778
Change-Id: I3df99e0fafff4bf807b952ad4bf976e2a481221d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>







Revert "Add qml/js files in resource files"
2013-06-14T17:59:35+00:00

Caroline Chao
caroline.chao@digia.com

2013-06-14T13:01:34+00:00

03c7e64ef5f3dfd10d61fd2473fb9f09b124c6e6

We need to investigate more this solution. Deployment issue
for Qt Quick Controls will be a known limitation in 5.1.0.

This reverts commit 41e13d3746c8b7b5cd550091c63fd8ab066422cf.

Change-Id: I501be7494bdbdfbb799d31c612d0c20e7f87ffc7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>





We need to investigate more this solution. Deployment issue
for Qt Quick Controls will be a known limitation in 5.1.0.

This reverts commit 41e13d3746c8b7b5cd550091c63fd8ab066422cf.

Change-Id: I501be7494bdbdfbb799d31c612d0c20e7f87ffc7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>







Doc: Fixed Qt Quick Layouts listing in qch files.
2013-06-14T13:46:07+00:00

Jerome Pasion
jerome.pasion@digia.com

2013-06-14T13:39:33+00:00

45b5cfa643193d24f97122b8803efe11358de4ae

-should be lowercase in selectors variable

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





-should be lowercase in selectors variable

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







Add qml/js files in resource files
2013-06-13T14:19:14+00:00

Caroline Chao
caroline.chao@digia.com

2013-06-11T07:13:44+00:00

41e13d3746c8b7b5cd550091c63fd8ab066422cf

To make deployment of Qt Quick Controls based
applications easier.

Task-number: QTBUG-31565

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





To make deployment of Qt Quick Controls based
applications easier.

Task-number: QTBUG-31565

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







Move doc from the index to the overview page
2013-06-12T12:15:39+00:00

Caroline Chao
caroline.chao@digia.com

2013-06-10T07:38:28+00:00

3b10c17e34bd6da6278600f57a0ecafe5eb58431

Cleanup the links.

And doc fix in TableViewStyle.qml

Change-Id: Id61fcff49af79f35f68696900142bb200ae18042
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>





Cleanup the links.

And doc fix in TableViewStyle.qml

Change-Id: Id61fcff49af79f35f68696900142bb200ae18042
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>







Fix TableView::positionViewAtRow()
2013-06-11T11:44:28+00:00

J-P Nurmi
jpnurmi@digia.com

2013-06-11T07:21:05+00:00

68abb104e902454b8daba23b108c1ad89e33d890

Task-number: QTBUG-31631
Change-Id: Iaf5bd5c895f0fd94c7ffec19b571786ee9352782
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>





Task-number: QTBUG-31631
Change-Id: Iaf5bd5c895f0fd94c7ffec19b571786ee9352782
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>