U1DB Qt/ QML

Merge lp:~kalikiana/u1db-qt/crossdoc into lp:u1db-qt

  1. crossdoc
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 93
Merged at revision: 90
Proposed branch: lp:~kalikiana/u1db-qt/crossdoc
Merge into: lp:u1db-qt
Diff against target: 85 lines (+15/-2)
7 files modified
debian/changelog (+5/-0)
debian/control (+1/-0)
debian/libu1db-qt5-doc.install (+1/-0)
documentation/CMakeLists.txt (+4/-0)
documentation/overview.qdoc (+1/-1)
documentation/u1db.qdocconf (+2/-0)
documentation/u1db.tutorial.qdoc (+1/-1)
To merge this branch: bzr merge lp:~kalikiana/u1db-qt/crossdoc
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Cris Dywan Approve
Review via email: mp+163482@code.launchpad.net

This proposal supersedes a proposal from 2013-05-02.

Commit message

Add .index file for cross-linking to -doc package and set URL

Description of the change

Add .index file for cross-linking to -doc package and set URL

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote : Posted in a previous version of this proposal

This requires bug 1175389.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:89
http://91.189.93.125:8080/job/u1db-qt-ci/33/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/33
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/33

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/33/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:90
http://91.189.93.125:8080/job/u1db-qt-ci/34/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/34/console
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/34/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/34/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:90
http://91.189.93.125:8080/job/u1db-qt-ci/36/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/36/console
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/36/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/36/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:90
http://91.189.93.125:8080/job/u1db-qt-ci/46/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/46/console
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/46/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/46/rebuild

review: Needs Fixing (continuous-integration)
lp:~kalikiana/u1db-qt/crossdoc updated
91. By Cris Dywan

Merge lp:u1db-qt

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:91
http://91.189.93.125:8080/job/u1db-qt-ci/47/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/47/console
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/47/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/47/rebuild

review: Needs Fixing (continuous-integration)
lp:~kalikiana/u1db-qt/crossdoc updated
92. By Cris Dywan

Depend on ubuntu-ui-toolkit-doc at build-time for cross-linking

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:92
http://91.189.93.125:8080/job/u1db-qt-ci/48/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/48/console
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/48/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/48/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:92
http://91.189.93.125:8080/job/u1db-qt-ci/49/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/49/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/49/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:92
http://91.189.93.125:8080/job/u1db-qt-ci/50/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/51/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/50/rebuild

review: Needs Fixing (continuous-integration)
lp:~kalikiana/u1db-qt/crossdoc updated
93. By Cris Dywan

Follow up on ui-toolkit doc index rename

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:93
http://91.189.93.125:8080/job/u1db-qt-ci/51/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/52

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/51/rebuild

review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-02 21:49:51 +0000
3+++ debian/changelog 2013-05-13 12:27:22 +0000
4@@ -1,3 +1,8 @@
5+u1db-qt (0.1.5) quantal; urgency=low
6+ * Add .index file for cross-linking to -doc package and set URL
7+
8+ -- Christian Dywan <christian.dywan@canonical.com> Mon, 13 May 2013 10:58:01 +0200
9+
10 u1db-qt (0.1.4) quantal; urgency=low
11 * Add qch file for QtCreator to -dev package
12
13
14=== modified file 'debian/control'
15--- debian/control 2013-04-12 14:50:39 +0000
16+++ debian/control 2013-05-13 12:27:22 +0000
17@@ -12,6 +12,7 @@
18 qtdeclarative5-qtquick2-plugin,
19 libqt5sql5-sqlite,
20 qttools5-dev-tools,
21+ ubuntu-ui-toolkit-doc,
22 qtdeclarative5-dev-tools
23 Standards-Version: 3.9.3
24 Vcs-Bzr: https://launchpad.net/u1db-qt/trunk
25
26=== modified file 'debian/libu1db-qt5-doc.install'
27--- debian/libu1db-qt5-doc.install 2013-04-22 14:36:13 +0000
28+++ debian/libu1db-qt5-doc.install 2013-05-13 12:27:22 +0000
29@@ -1,3 +1,4 @@
30 usr/share/qt5/phrasebooks/*
31+usr/share/u1db-qt/doc/html/*.index
32 usr/share/u1db-qt/doc/html/*.html
33 usr/share/u1db-qt/doc/html/style/*.css
34
35=== modified file 'documentation/CMakeLists.txt'
36--- documentation/CMakeLists.txt 2013-05-02 21:18:17 +0000
37+++ documentation/CMakeLists.txt 2013-05-13 12:27:22 +0000
38@@ -32,6 +32,10 @@
39 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"
40 FILES_MATCHING PATTERN "*.html"
41 )
42+ install(DIRECTORY "${U1DB_DOCS}/"
43+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"
44+ FILES_MATCHING PATTERN "*.index"
45+ )
46 install(DIRECTORY "${U1DB_DOCS}/style/"
47 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html/style"
48 FILES_MATCHING PATTERN "*.css"
49
50=== modified file 'documentation/overview.qdoc'
51--- documentation/overview.qdoc 2013-04-23 13:11:30 +0000
52+++ documentation/overview.qdoc 2013-05-13 12:27:22 +0000
53@@ -25,7 +25,7 @@
54 \part General Topics
55 \list
56 \li \l {Tutorial} gives a quick start guide from storing a document
57- to querying a database and displaying it in Ubuntu Components.
58+ to querying a database and displaying it in \l {Ubuntu User Interface Toolkit}{Ubuntu Components}.
59 \li \l {Design Concepts} provides an overview of the design and
60 terminology.
61 \endlist
62
63=== modified file 'documentation/u1db.qdocconf'
64--- documentation/u1db.qdocconf 2013-05-02 23:42:42 +0000
65+++ documentation/u1db.qdocconf 2013-05-13 12:27:22 +0000
66@@ -1,5 +1,7 @@
67 project = U1Db-Qt
68 description = U1Db-Qt plugin documentation
69+url = http://developer.ubuntu.com/api/ubuntu-12.10/qml/u1db/
70+indexes = /usr/share/ubuntu-ui-toolkit/doc/html/ubuntuuserinterfacetoolkit.index
71
72 sourcedirs = ../src \
73 ../documentation
74
75=== modified file 'documentation/u1db.tutorial.qdoc'
76--- documentation/u1db.tutorial.qdoc 2013-04-22 11:28:15 +0000
77+++ documentation/u1db.tutorial.qdoc 2013-05-13 12:27:22 +0000
78@@ -25,7 +25,7 @@
79
80 In U1Db-Qt, the Database element is the the central figure that works in conjunction with Document elements, and in the future indexing (currently under development), and querying (currently under development) elements. It is the Database element that defines the location of the data repository.
81
82-A Database element is also a valuable tool for cases where specific data from a repository needs to be retrieved quickly, without indexing or querying ahead of time. The 'contents' object associated with the Database element can be used together with standard elements (see: Standard Elements -> TextField & TextArea) and model-based elements (see: Model-Based Elements -> ListView).
83+A Database element is also a valuable tool for cases where specific data from a repository needs to be retrieved quickly, without indexing or querying ahead of time. The 'contents' object associated with the Database element can be used together with base items such as TextField or TextArea and model-based items like ListView and \l {Standard}{ListItems.Standard}.
84
85 \section1 2.0.1 Database Properties
86

Subscribers

People subscribed via source and target branches

to all changes: