Ubuntu UI Toolkit

Merge lp:~kalikiana/ubuntu-ui-toolkit/cutedocs into lp:ubuntu-ui-toolkit

  1. cutedocs
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Zsombor Egri
Approved revision: 812
Merged at revision: 845
Proposed branch: lp:~kalikiana/ubuntu-ui-toolkit/cutedocs
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 68 lines (+22/-4)
3 files modified
debian/control (+12/-0)
documentation/ubuntu-ui-toolkit-online.qdocconf (+9/-0)
modules/Ubuntu/Components/Action.qml (+1/-4)
To merge this branch: bzr merge lp:~kalikiana/ubuntu-ui-toolkit/cutedocs
Reviewer Review Type Date Requested Status
Zsombor Egri Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+193280@code.launchpad.net

Commit message

Add dependencies and indexes to link Qt5 and Ubuntu.Unity.Action docs

Description of the change

Note: This is blocking on a non-gzipped .index file being shipped with unity-action-doc as addressed by lp:~kalikiana/unity-action-api/cutedocs.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:811
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/212
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/206/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/76
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/212
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/206
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/206/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2827/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2878/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/694
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/693

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1128/rebuild

review: Needs Fixing (continuous-integration)
lp:~kalikiana/ubuntu-ui-toolkit/cutedocs updated
812. By Cris Dywan

Add depenendencies and index to link to Ubuntu.Unity.Action docs

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:812
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1215/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/695
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/681/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/163
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/163/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/631
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/695
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/695/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/681
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/681/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3310
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1406

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/1215/rebuild

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

PASSED: Continuous integration, rev:812
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/706
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/169
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/720
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/706
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/706/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3337
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1426

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/1221/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Looks nice, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 qtdeclarative5-qtfeedback-plugin,
6 qtdeclarative5-unity-action-plugin,
7 qtdeclarative5-localstorage-plugin,
8+ qtdeclarative5-doc-html,
9+ qtwebkit5-doc-html,
10+ qtsvg5-doc-html,
11+ qtscript5-doc-html,
12+ qtmultimedia5-doc-html,
13+ unity-action-doc,
14 devscripts,
15 libqt5organizer5,
16 qtpim5-dev,
17@@ -81,6 +87,12 @@
18 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
19 Depends: ${misc:Depends},
20 ${shlibs:Depends},
21+ qtdeclarative5-doc-html,
22+ qtwebkit5-doc-html,
23+ qtsvg5-doc-html,
24+ qtscript5-doc-html,
25+ qtmultimedia5-doc-html,
26+ unity-action-doc,
27 Conflicts: qt-components-ubuntu-doc
28 Replaces: qt-components-ubuntu-doc
29 Provides: qt-components-ubuntu-doc
30
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 include(ubuntu-appdev-site-header.qdocconf)
36 include(ubuntu-appdev-site-footer.qdocconf)
37
38+indexes = \
39+ /usr/share/qt5/doc/qtqml/qtqml.index \
40+ /usr/share/qt5/doc/qtquick/qtquick.index \
41+ /usr/share/qt5/doc/qtwebkit/qtwebkit.index \
42+ /usr/share/qt5/doc/qtsvg/qtsvg.index \
43+ /usr/share/qt5/doc/qtscript/qtscript.index \
44+ /usr/share/qt5/doc/qtmultimedia/qtmultimedia.index \
45+ /usr/share/doc/unity-action/qml/unity-action-qml-api.index \
46+
47 HTML.nobreadcrumbs = "false"
48
49 HTML.headerstyles = \
50
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
56 Examples: See \l Page
57 */
58+
59 UnityActions.Action {
60 id: action
61
62- // FIXME: the properties that are not defined here, but only documented using qmlproperty
63- // do not show up in the documentation. Best is to replace these docs by a reference
64- // to UnityActions.Action when they become available online.
65-
66 /*!
67 The title of the action.
68 \qmlproperty string Ubuntu.Components.Action::text

Subscribers

People subscribed via source and target branches

to status/vote changes: