Merge lp:~michael-sheldon/content-hub/qdoc-import-fix into lp:content-hub

Proposed by Michael Sheldon
Status: Merged
Merged at revision: 91
Proposed branch: lp:~michael-sheldon/content-hub/qdoc-import-fix
Merge into: lp:content-hub
Prerequisite: lp:~michael-sheldon/content-hub/qdoc-fix
Diff against target: 162 lines (+15/-12)
13 files modified
doc/qml/pages/mainpage.qdoc (+1/-1)
doc/qml/pages/moduledef.qdoc (+3/-0)
import/Ubuntu/Content/ContentPeerPicker.qml (+1/-1)
import/Ubuntu/Content/ContentTransferHint.qml (+1/-1)
import/Ubuntu/Content/contenthandler.cpp (+1/-1)
import/Ubuntu/Content/contenthub.cpp (+1/-1)
import/Ubuntu/Content/contentitem.cpp (+1/-1)
import/Ubuntu/Content/contentpeer.cpp (+1/-1)
import/Ubuntu/Content/contentpeermodel.cpp (+1/-1)
import/Ubuntu/Content/contentscope.cpp (+1/-1)
import/Ubuntu/Content/contentstore.cpp (+1/-1)
import/Ubuntu/Content/contenttransfer.cpp (+1/-1)
import/Ubuntu/Content/contenttype.cpp (+1/-1)
To merge this branch: bzr merge lp:~michael-sheldon/content-hub/qdoc-import-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ken VanDine Pending
Review via email: mp+213838@code.launchpad.net

Commit message

Fixes version number of import statements in QML documentation.

Description of the change

Fixes version number of import statements in QML documentation.

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No change

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/qml/pages/mainpage.qdoc'
2--- doc/qml/pages/mainpage.qdoc 2014-03-20 13:32:26 +0000
3+++ doc/qml/pages/mainpage.qdoc 2014-04-02 12:48:12 +0000
4@@ -115,7 +115,7 @@
5 target: root.activeTransfer
6 onStateChanged: {
7 if (root.activeTransfer.state === ContentTransfer.Charged)
8- importItmes = root.activeTransfer.items;
9+ importItems = root.activeTransfer.items;
10 }
11 }
12 }
13
14=== added file 'doc/qml/pages/moduledef.qdoc'
15--- doc/qml/pages/moduledef.qdoc 1970-01-01 00:00:00 +0000
16+++ doc/qml/pages/moduledef.qdoc 2014-04-02 12:48:12 +0000
17@@ -0,0 +1,3 @@
18+/*!
19+ \qmlmodule Ubuntu.Content 0.1
20+*/
21
22=== modified file 'import/Ubuntu/Content/ContentPeerPicker.qml'
23--- import/Ubuntu/Content/ContentPeerPicker.qml 2014-03-20 13:04:57 +0000
24+++ import/Ubuntu/Content/ContentPeerPicker.qml 2014-04-02 12:48:12 +0000
25@@ -22,7 +22,7 @@
26
27 /*!
28 \qmltype ContentPeerPicker
29- \inqmlmodule Ubuntu.Content 0.1
30+ \inqmlmodule Ubuntu.Content
31 \brief Component that allows users to select a source/destination for content transfer
32
33 This component displays a list of applications, devices and services which
34
35=== modified file 'import/Ubuntu/Content/ContentTransferHint.qml'
36--- import/Ubuntu/Content/ContentTransferHint.qml 2014-03-20 13:04:57 +0000
37+++ import/Ubuntu/Content/ContentTransferHint.qml 2014-04-02 12:48:12 +0000
38@@ -21,7 +21,7 @@
39
40 /*!
41 \qmltype ContentTransferHint
42- \inqmlmodule Ubuntu.Content 0.1
43+ \inqmlmodule Ubuntu.Content
44 \brief Component that indicates that a transfer is active
45
46 This component shows that the transfer is currently running, and the source
47
48=== modified file 'import/Ubuntu/Content/contenthandler.cpp'
49--- import/Ubuntu/Content/contenthandler.cpp 2014-03-04 21:47:48 +0000
50+++ import/Ubuntu/Content/contenthandler.cpp 2014-04-02 12:48:12 +0000
51@@ -20,7 +20,7 @@
52 /*!
53 \qmltype ContentHandler
54 \instantiates ContentHandler
55- \inqmlmodule Ubuntu.Content 0.1
56+ \inqmlmodule Ubuntu.Content
57
58 \sa ContentHub
59
60
61=== modified file 'import/Ubuntu/Content/contenthub.cpp'
62--- import/Ubuntu/Content/contenthub.cpp 2014-03-07 21:07:27 +0000
63+++ import/Ubuntu/Content/contenthub.cpp 2014-04-02 12:48:12 +0000
64@@ -31,7 +31,7 @@
65 /*!
66 * \qmltype ContentHub
67 * \instantiates ContentHub
68- * \inqmlmodule Ubuntu.Content 0.1
69+ * \inqmlmodule Ubuntu.Content
70 *
71 * Example usage for importing content:
72 * \qml
73
74=== modified file 'import/Ubuntu/Content/contentitem.cpp'
75--- import/Ubuntu/Content/contentitem.cpp 2014-03-04 21:47:48 +0000
76+++ import/Ubuntu/Content/contentitem.cpp 2014-04-02 12:48:12 +0000
77@@ -20,7 +20,7 @@
78 /*!
79 * \qmltype ContentItem
80 * \instantiates ContentItem
81- * \inqmlmodule Ubuntu.Content 0.1
82+ * \inqmlmodule Ubuntu.Content
83 * \brief Content that can be imported or exported from a ContentPeer
84 *
85 * A ContentItem is an item that can be imported or exported from a ContentPeer
86
87=== modified file 'import/Ubuntu/Content/contentpeer.cpp'
88--- import/Ubuntu/Content/contentpeer.cpp 2014-03-20 23:44:21 +0000
89+++ import/Ubuntu/Content/contentpeer.cpp 2014-04-02 12:48:12 +0000
90@@ -27,7 +27,7 @@
91 /*!
92 * \qmltype ContentPeer
93 * \instantiates ContentPeer
94- * \inqmlmodule Ubuntu.Content 0.1
95+ * \inqmlmodule Ubuntu.Content
96 * \brief An application that can export or import a ContentType
97 *
98 * A ContentPeer is an application that is registered in the ContentHub as
99
100=== modified file 'import/Ubuntu/Content/contentpeermodel.cpp'
101--- import/Ubuntu/Content/contentpeermodel.cpp 2014-03-20 23:44:21 +0000
102+++ import/Ubuntu/Content/contentpeermodel.cpp 2014-04-02 12:48:12 +0000
103@@ -23,7 +23,7 @@
104 /*!
105 * \qmltype ContentPeerModel
106 * \instantiates ContentPeerModel
107- * \inqmlmodule Ubuntu.Content 0.1
108+ * \inqmlmodule Ubuntu.Content
109 * \brief A list of applications that can export or import a ContentType
110 *
111 * A ContentPeerModel provides a list of all applications that are registered
112
113=== modified file 'import/Ubuntu/Content/contentscope.cpp'
114--- import/Ubuntu/Content/contentscope.cpp 2014-03-04 21:47:48 +0000
115+++ import/Ubuntu/Content/contentscope.cpp 2014-04-02 12:48:12 +0000
116@@ -20,7 +20,7 @@
117 /*!
118 \qmltype ContentScope
119 \instantiates ContentScope
120- \inqmlmodule Ubuntu.Content 0.1
121+ \inqmlmodule Ubuntu.Content
122
123 \sa ContentStore
124
125
126=== modified file 'import/Ubuntu/Content/contentstore.cpp'
127--- import/Ubuntu/Content/contentstore.cpp 2014-03-20 23:44:21 +0000
128+++ import/Ubuntu/Content/contentstore.cpp 2014-04-02 12:48:12 +0000
129@@ -22,7 +22,7 @@
130 /*!
131 * \qmltype ContentStore
132 * \instantiates ContentStore
133- * \inqmlmodule Ubuntu.Content 0.1
134+ * \inqmlmodule Ubuntu.Content
135 *
136 * A ContentStore allows for the permanent storage of a transfered item.
137 *
138
139=== modified file 'import/Ubuntu/Content/contenttransfer.cpp'
140--- import/Ubuntu/Content/contenttransfer.cpp 2014-03-07 21:07:27 +0000
141+++ import/Ubuntu/Content/contenttransfer.cpp 2014-04-02 12:48:12 +0000
142@@ -23,7 +23,7 @@
143 /*!
144 * \qmltype ContentTransfer
145 * \instantiates ContentTransfer
146- * \inqmlmodule Ubuntu.Content 0.1
147+ * \inqmlmodule Ubuntu.Content
148 *
149 * See documentation for ContentHub
150 */
151
152=== modified file 'import/Ubuntu/Content/contenttype.cpp'
153--- import/Ubuntu/Content/contenttype.cpp 2014-03-20 23:44:21 +0000
154+++ import/Ubuntu/Content/contenttype.cpp 2014-04-02 12:48:12 +0000
155@@ -20,7 +20,7 @@
156 /*!
157 \qmltype ContentType
158 \instantiates ContentType
159- \inqmlmodule Ubuntu.Content 0.1
160+ \inqmlmodule Ubuntu.Content
161
162 \sa ContentHub
163

Subscribers

People subscribed via source and target branches