content-hub

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

  1. qdoc-import-fix
  2. Merge into trunk
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 :

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/content-hub-ci/140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/43

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/140/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/qml/pages/mainpage.qdoc'
--- doc/qml/pages/mainpage.qdoc 2014-03-20 13:32:26 +0000
+++ doc/qml/pages/mainpage.qdoc 2014-04-02 12:48:12 +0000
@@ -115,7 +115,7 @@
115 target: root.activeTransfer115 target: root.activeTransfer
116 onStateChanged: {116 onStateChanged: {
117 if (root.activeTransfer.state === ContentTransfer.Charged)117 if (root.activeTransfer.state === ContentTransfer.Charged)
118 importItmes = root.activeTransfer.items;118 importItems = root.activeTransfer.items;
119 }119 }
120 }120 }
121}121}
122122
=== added file 'doc/qml/pages/moduledef.qdoc'
--- doc/qml/pages/moduledef.qdoc 1970-01-01 00:00:00 +0000
+++ doc/qml/pages/moduledef.qdoc 2014-04-02 12:48:12 +0000
@@ -0,0 +1,3 @@
1/*!
2 \qmlmodule Ubuntu.Content 0.1
3*/
04
=== modified file 'import/Ubuntu/Content/ContentPeerPicker.qml'
--- import/Ubuntu/Content/ContentPeerPicker.qml 2014-03-20 13:04:57 +0000
+++ import/Ubuntu/Content/ContentPeerPicker.qml 2014-04-02 12:48:12 +0000
@@ -22,7 +22,7 @@
2222
23/*!23/*!
24 \qmltype ContentPeerPicker24 \qmltype ContentPeerPicker
25 \inqmlmodule Ubuntu.Content 0.125 \inqmlmodule Ubuntu.Content
26 \brief Component that allows users to select a source/destination for content transfer26 \brief Component that allows users to select a source/destination for content transfer
2727
28 This component displays a list of applications, devices and services which28 This component displays a list of applications, devices and services which
2929
=== modified file 'import/Ubuntu/Content/ContentTransferHint.qml'
--- import/Ubuntu/Content/ContentTransferHint.qml 2014-03-20 13:04:57 +0000
+++ import/Ubuntu/Content/ContentTransferHint.qml 2014-04-02 12:48:12 +0000
@@ -21,7 +21,7 @@
2121
22/*!22/*!
23 \qmltype ContentTransferHint23 \qmltype ContentTransferHint
24 \inqmlmodule Ubuntu.Content 0.124 \inqmlmodule Ubuntu.Content
25 \brief Component that indicates that a transfer is active25 \brief Component that indicates that a transfer is active
2626
27 This component shows that the transfer is currently running, and the source27 This component shows that the transfer is currently running, and the source
2828
=== modified file 'import/Ubuntu/Content/contenthandler.cpp'
--- import/Ubuntu/Content/contenthandler.cpp 2014-03-04 21:47:48 +0000
+++ import/Ubuntu/Content/contenthandler.cpp 2014-04-02 12:48:12 +0000
@@ -20,7 +20,7 @@
20/*!20/*!
21 \qmltype ContentHandler21 \qmltype ContentHandler
22 \instantiates ContentHandler22 \instantiates ContentHandler
23 \inqmlmodule Ubuntu.Content 0.123 \inqmlmodule Ubuntu.Content
2424
25 \sa ContentHub25 \sa ContentHub
2626
2727
=== modified file 'import/Ubuntu/Content/contenthub.cpp'
--- import/Ubuntu/Content/contenthub.cpp 2014-03-07 21:07:27 +0000
+++ import/Ubuntu/Content/contenthub.cpp 2014-04-02 12:48:12 +0000
@@ -31,7 +31,7 @@
31/*!31/*!
32 * \qmltype ContentHub32 * \qmltype ContentHub
33 * \instantiates ContentHub33 * \instantiates ContentHub
34 * \inqmlmodule Ubuntu.Content 0.134 * \inqmlmodule Ubuntu.Content
35 *35 *
36 * Example usage for importing content:36 * Example usage for importing content:
37 * \qml37 * \qml
3838
=== modified file 'import/Ubuntu/Content/contentitem.cpp'
--- import/Ubuntu/Content/contentitem.cpp 2014-03-04 21:47:48 +0000
+++ import/Ubuntu/Content/contentitem.cpp 2014-04-02 12:48:12 +0000
@@ -20,7 +20,7 @@
20/*!20/*!
21 * \qmltype ContentItem21 * \qmltype ContentItem
22 * \instantiates ContentItem22 * \instantiates ContentItem
23 * \inqmlmodule Ubuntu.Content 0.123 * \inqmlmodule Ubuntu.Content
24 * \brief Content that can be imported or exported from a ContentPeer24 * \brief Content that can be imported or exported from a ContentPeer
25 *25 *
26 * A ContentItem is an item that can be imported or exported from a ContentPeer26 * A ContentItem is an item that can be imported or exported from a ContentPeer
2727
=== modified file 'import/Ubuntu/Content/contentpeer.cpp'
--- import/Ubuntu/Content/contentpeer.cpp 2014-03-20 23:44:21 +0000
+++ import/Ubuntu/Content/contentpeer.cpp 2014-04-02 12:48:12 +0000
@@ -27,7 +27,7 @@
27/*!27/*!
28 * \qmltype ContentPeer28 * \qmltype ContentPeer
29 * \instantiates ContentPeer29 * \instantiates ContentPeer
30 * \inqmlmodule Ubuntu.Content 0.130 * \inqmlmodule Ubuntu.Content
31 * \brief An application that can export or import a ContentType31 * \brief An application that can export or import a ContentType
32 *32 *
33 * A ContentPeer is an application that is registered in the ContentHub as33 * A ContentPeer is an application that is registered in the ContentHub as
3434
=== modified file 'import/Ubuntu/Content/contentpeermodel.cpp'
--- import/Ubuntu/Content/contentpeermodel.cpp 2014-03-20 23:44:21 +0000
+++ import/Ubuntu/Content/contentpeermodel.cpp 2014-04-02 12:48:12 +0000
@@ -23,7 +23,7 @@
23/*!23/*!
24 * \qmltype ContentPeerModel24 * \qmltype ContentPeerModel
25 * \instantiates ContentPeerModel25 * \instantiates ContentPeerModel
26 * \inqmlmodule Ubuntu.Content 0.126 * \inqmlmodule Ubuntu.Content
27 * \brief A list of applications that can export or import a ContentType27 * \brief A list of applications that can export or import a ContentType
28 *28 *
29 * A ContentPeerModel provides a list of all applications that are registered29 * A ContentPeerModel provides a list of all applications that are registered
3030
=== modified file 'import/Ubuntu/Content/contentscope.cpp'
--- import/Ubuntu/Content/contentscope.cpp 2014-03-04 21:47:48 +0000
+++ import/Ubuntu/Content/contentscope.cpp 2014-04-02 12:48:12 +0000
@@ -20,7 +20,7 @@
20/*!20/*!
21 \qmltype ContentScope21 \qmltype ContentScope
22 \instantiates ContentScope22 \instantiates ContentScope
23 \inqmlmodule Ubuntu.Content 0.123 \inqmlmodule Ubuntu.Content
2424
25 \sa ContentStore25 \sa ContentStore
2626
2727
=== modified file 'import/Ubuntu/Content/contentstore.cpp'
--- import/Ubuntu/Content/contentstore.cpp 2014-03-20 23:44:21 +0000
+++ import/Ubuntu/Content/contentstore.cpp 2014-04-02 12:48:12 +0000
@@ -22,7 +22,7 @@
22/*!22/*!
23 * \qmltype ContentStore23 * \qmltype ContentStore
24 * \instantiates ContentStore24 * \instantiates ContentStore
25 * \inqmlmodule Ubuntu.Content 0.125 * \inqmlmodule Ubuntu.Content
26 *26 *
27 * A ContentStore allows for the permanent storage of a transfered item.27 * A ContentStore allows for the permanent storage of a transfered item.
28 *28 *
2929
=== modified file 'import/Ubuntu/Content/contenttransfer.cpp'
--- import/Ubuntu/Content/contenttransfer.cpp 2014-03-07 21:07:27 +0000
+++ import/Ubuntu/Content/contenttransfer.cpp 2014-04-02 12:48:12 +0000
@@ -23,7 +23,7 @@
23/*!23/*!
24 * \qmltype ContentTransfer24 * \qmltype ContentTransfer
25 * \instantiates ContentTransfer25 * \instantiates ContentTransfer
26 * \inqmlmodule Ubuntu.Content 0.126 * \inqmlmodule Ubuntu.Content
27 *27 *
28 * See documentation for ContentHub28 * See documentation for ContentHub
29 */29 */
3030
=== modified file 'import/Ubuntu/Content/contenttype.cpp'
--- import/Ubuntu/Content/contenttype.cpp 2014-03-20 23:44:21 +0000
+++ import/Ubuntu/Content/contenttype.cpp 2014-04-02 12:48:12 +0000
@@ -20,7 +20,7 @@
20/*!20/*!
21 \qmltype ContentType21 \qmltype ContentType
22 \instantiates ContentType22 \instantiates ContentType
23 \inqmlmodule Ubuntu.Content 0.123 \inqmlmodule Ubuntu.Content
2424
25 \sa ContentHub25 \sa ContentHub
2626

Subscribers

People subscribed via source and target branches