Ubuntu UI Toolkit

Merge lp:~tpeeters/ubuntu-ui-toolkit/noPrivateHeader into lp:~bzoltan/ubuntu-ui-toolkit/landing_28-05

  1. noPrivateHeader
  2. Merge into landing_28-05
Proposed by Tim Peeters
Status: Merged
Merged at revision: 1089
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/noPrivateHeader
Merge into: lp:~bzoltan/ubuntu-ui-toolkit/landing_28-05
Diff against target: 57 lines (+16/-2)
3 files modified
CHANGES (+1/-1)
components.api (+13/-0)
modules/Ubuntu/Components/qmldir (+2/-1)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/noPrivateHeader
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+221281@code.launchpad.net

Commit message

Undo changes of r1082 that cause a regression in messaging-app (and contenthub).

Description of the change

Undo changes of r1082 that cause a regression in messaging-app (and contenthub).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CHANGES'
2--- CHANGES 2014-05-23 06:15:17 +0000
3+++ CHANGES 2014-05-28 18:11:16 +0000
4@@ -12,7 +12,7 @@
5
6 Compatibility Breaks
7 ********************
8-* Header component API was made internal (as it was always documented)
9+
10
11 Ubuntu.Components 1.0
12 #####################
13
14=== modified file 'components.api'
15--- components.api 2014-05-28 05:38:38 +0000
16+++ components.api 2014-05-28 18:11:16 +0000
17@@ -62,6 +62,19 @@
18 readonly property bool running
19 property size sourceSize
20 readonly property int status
21+Header 0.1 1.0
22+StyledItem
23+ property bool animate
24+ function show()
25+ function hide()
26+ property string title
27+ property Item contents
28+ property var tabsModel
29+ property var pageStack
30+ property var actions
31+ property var __customBackAction
32+ property Flickable flickable
33+ property bool useDeprecatedToolbar
34 Icon 0.1 1.0
35 Item
36 property string name
37
38=== modified file 'modules/Ubuntu/Components/qmldir'
39--- modules/Ubuntu/Components/qmldir 2014-05-20 19:32:14 +0000
40+++ modules/Ubuntu/Components/qmldir 2014-05-28 18:11:16 +0000
41@@ -29,7 +29,7 @@
42 internal PageTreeNode PageTreeNode.qml
43 PageStack 0.1 PageStack.qml
44 internal Toolbar Toolbar.qml
45-internal Header Header.qml
46+Header 0.1 Header.qml
47 internal AnimatedItem AnimatedItem.qml
48 internal PageWrapper PageWrapper.qml
49 UbuntuShape 0.1 UbuntuShape.qml
50@@ -76,6 +76,7 @@
51 OptionSelectorDelegate 1.0 OptionSelectorDelegate.qml
52 Page 1.0 Page.qml
53 PageStack 1.0 PageStack.qml
54+Header 1.0 Header.qml
55 UbuntuShape 1.0 UbuntuShape.qml
56 CrossFadeImage 1.0 CrossFadeImage.qml
57 Icon 1.0 Icon.qml

Subscribers

People subscribed via source and target branches

to all changes: