content-hub

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

  1. doc_imports
  2. Merge into trunk
Proposed by Ken VanDine
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
Ubuntu Phablet Team 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.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

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)
Reply

Unmerged revisions

281. By Ken VanDine

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
=== modified file 'doc/qml/pages/mainpage.qdoc'
--- doc/qml/pages/mainpage.qdoc 2015-08-12 17:44:03 +0000
+++ doc/qml/pages/mainpage.qdoc 2016-07-08 19:01:52 +0000
@@ -66,9 +66,9 @@
66\section1 Example usage - Importing Pictures66\section1 Example usage - Importing Pictures
6767
68\qml68\qml
69import QtQuick 2.069import QtQuick 2.4
70import Ubuntu.Components 1.170import Ubuntu.Components 1.3
71import Ubuntu.Content 1.171import Ubuntu.Content 1.3
7272
73Rectangle {73Rectangle {
74 id: root74 id: root
@@ -140,7 +140,7 @@
140\part Components140\part Components
141Available through:141Available through:
142\code142\code
143 import Ubuntu.Content 1.1143 import Ubuntu.Content 1.3
144\endcode144\endcode
145145
146*/146*/
147147
=== modified file 'doc/qml/pages/moduledef.qdoc'
--- doc/qml/pages/moduledef.qdoc 2014-07-22 08:44:11 +0000
+++ doc/qml/pages/moduledef.qdoc 2016-07-08 19:01:52 +0000
@@ -1,3 +1,3 @@
1/*!1/*!
2 \qmlmodule Ubuntu.Content 1.12 \qmlmodule Ubuntu.Content 1.3
3*/3*/

Subscribers

People subscribed via source and target branches