Merge lp:~ken-vandine/content-hub/doc_imports into lp:content-hub

Proposed by Ken VanDine on 2016-07-08
Status: Needs review
Proposed branch: lp:~ken-vandine/content-hub/doc_imports
Merge into: lp:content-hub
Diff against target: 34 lines (+5/-5)
2 files modified
doc/qml/pages/mainpage.qdoc (+4/-4)
doc/qml/pages/moduledef.qdoc (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/content-hub/doc_imports
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing on 2016-07-08
Ubuntu Phablet Team 2016-07-08 Pending
Review via email: mp+299597@code.launchpad.net

Commit message

Bumped the QML module import versions to 1.3 in the docs

Description of the change

Bumped the QML module import versions to 1.3 in the docs

To post a comment you must log in.

FAILED: Continuous integration, rev:281
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/21/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/919
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/163/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/919
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/829
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/829
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/829
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/829
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/829/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/829
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/829/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/829
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/829/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/829
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/829/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/829
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/829/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/829
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/829/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/829
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/829/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/829
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/829/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/829
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/829/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/21/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

281. By Ken VanDine on 2016-07-08

Bumped the QML module import versions to 1.3 in the docs

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 2015-08-12 17:44:03 +0000
3+++ doc/qml/pages/mainpage.qdoc 2016-07-08 19:01:52 +0000
4@@ -66,9 +66,9 @@
5 \section1 Example usage - Importing Pictures
6
7 \qml
8-import QtQuick 2.0
9-import Ubuntu.Components 1.1
10-import Ubuntu.Content 1.1
11+import QtQuick 2.4
12+import Ubuntu.Components 1.3
13+import Ubuntu.Content 1.3
14
15 Rectangle {
16 id: root
17@@ -140,7 +140,7 @@
18 \part Components
19 Available through:
20 \code
21- import Ubuntu.Content 1.1
22+ import Ubuntu.Content 1.3
23 \endcode
24
25 */
26
27=== modified file 'doc/qml/pages/moduledef.qdoc'
28--- doc/qml/pages/moduledef.qdoc 2014-07-22 08:44:11 +0000
29+++ doc/qml/pages/moduledef.qdoc 2016-07-08 19:01:52 +0000
30@@ -1,3 +1,3 @@
31 /*!
32- \qmlmodule Ubuntu.Content 1.1
33+ \qmlmodule Ubuntu.Content 1.3
34 */

Subscribers

People subscribed via source and target branches