1
=== modified file 'debian/control'
2
--- debian/control	2013-11-06 04:17:28 +0000
3
+++ debian/control	2013-11-13 13:41:09 +0000
4
@@ -23,6 +23,12 @@
5
23
               qtdeclarative5-qtfeedback-plugin,
23
               qtdeclarative5-qtfeedback-plugin,
6
24
               qtdeclarative5-unity-action-plugin,
24
               qtdeclarative5-unity-action-plugin,
7
25
               qtdeclarative5-localstorage-plugin,
25
               qtdeclarative5-localstorage-plugin,
8
26
         qtdeclarative5-doc-html,
9
27
         qtwebkit5-doc-html,
10
28
         qtsvg5-doc-html,
11
29
         qtscript5-doc-html,
12
30
         qtmultimedia5-doc-html,
13
31
         unity-action-doc,
14
26
               devscripts,
32
               devscripts,
15
27
               libqt5organizer5,
33
               libqt5organizer5,
16
28
               qtpim5-dev,
34
               qtpim5-dev,
17
@@ -81,6 +87,12 @@
18
81
Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
87
Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
19
82
Depends: ${misc:Depends},
88
Depends: ${misc:Depends},
20
83
         ${shlibs:Depends},
89
         ${shlibs:Depends},
21
90
         qtdeclarative5-doc-html,
22
91
         qtwebkit5-doc-html,
23
92
         qtsvg5-doc-html,
24
93
         qtscript5-doc-html,
25
94
         qtmultimedia5-doc-html,
26
95
         unity-action-doc,
27
84
Conflicts: qt-components-ubuntu-doc
96
Conflicts: qt-components-ubuntu-doc
28
85
Replaces: qt-components-ubuntu-doc
97
Replaces: qt-components-ubuntu-doc
29
86
Provides: qt-components-ubuntu-doc
98
Provides: qt-components-ubuntu-doc
30
87
99
31
=== modified file 'documentation/ubuntu-ui-toolkit-online.qdocconf'
32
--- documentation/ubuntu-ui-toolkit-online.qdocconf	2013-06-25 15:38:56 +0000
33
+++ documentation/ubuntu-ui-toolkit-online.qdocconf	2013-11-13 13:41:09 +0000
34
@@ -2,6 +2,15 @@
35
2
include(ubuntu-appdev-site-header.qdocconf)
2
include(ubuntu-appdev-site-header.qdocconf)
36
3
include(ubuntu-appdev-site-footer.qdocconf)
3
include(ubuntu-appdev-site-footer.qdocconf)
37
4
4
38
5
indexes = \
39
6
    /usr/share/qt5/doc/qtqml/qtqml.index \
40
7
    /usr/share/qt5/doc/qtquick/qtquick.index \
41
8
    /usr/share/qt5/doc/qtwebkit/qtwebkit.index \
42
9
    /usr/share/qt5/doc/qtsvg/qtsvg.index \
43
10
    /usr/share/qt5/doc/qtscript/qtscript.index \
44
11
    /usr/share/qt5/doc/qtmultimedia/qtmultimedia.index \
45
12
    /usr/share/doc/unity-action/qml/unity-action-qml-api.index \
46
13
47
5
HTML.nobreadcrumbs = "false"
14
HTML.nobreadcrumbs = "false"
48
6
15
49
7
HTML.headerstyles = \
16
HTML.headerstyles = \
50
8
17
51
=== modified file 'modules/Ubuntu/Components/Action.qml'
52
--- modules/Ubuntu/Components/Action.qml	2013-07-11 18:09:21 +0000
53
+++ modules/Ubuntu/Components/Action.qml	2013-11-13 13:41:09 +0000
54
@@ -27,13 +27,10 @@
55
27
27
56
28
    Examples: See \l Page
28
    Examples: See \l Page
57
29
*/
29
*/
58
30
59
30
UnityActions.Action {
31
UnityActions.Action {
60
31
    id: action
32
    id: action
61
32
33
62
33
    // FIXME: the properties that are not defined here, but only documented using qmlproperty
63
34
    //  do not show up in the documentation. Best is to replace these docs by a reference
64
35
    //  to UnityActions.Action when they become available online.
65
36
66
37
    /*!
34
    /*!
67
38
      The title of the action.
35
      The title of the action.
68
39
      \qmlproperty string Ubuntu.Components.Action::text
36
      \qmlproperty string Ubuntu.Components.Action::text
Reviewer	Review Type	Date Requested	Status
Zsombor Egri		2013-10-30	Approve on 2013-11-20
PS Jenkins bot	continuous-integration		Approve on 2013-11-17
Review via email: mp+193280@code.launchpad.net