U1DB Qt/ QML

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

  1. crossdoc
  2. Merge into trunk
Proposed by Cris Dywan
Status: Superseded
Proposed branch: lp:~kalikiana/u1db-qt/crossdoc
Merge into: lp:u1db-qt
Diff against target: 73 lines (+14/-2)
6 files modified
debian/changelog (+5/-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 Needs Fixing
U1DB Qt developers Pending
Review via email: mp+162208@code.launchpad.net

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

This proposal has been superseded by a proposal from 2013-05-13.

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 :

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)
lp:~kalikiana/u1db-qt/crossdoc updated
91. By Cris Dywan

Merge lp:u1db-qt

92. By Cris Dywan

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

93. By Cris Dywan

Follow up on ui-toolkit doc index rename

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-01 18:07:10 +0000
+++ debian/changelog 2013-05-02 18:25:42 +0000
@@ -1,3 +1,8 @@
1u1db-qt (0.1.4) quantal; urgency=low
2 * Add .index file for cross-linking to -doc package and set URL
3
4 -- Christian Dywan <christian.dywan@canonical.com> Wed, 01 May 2013 17:05:04 -0700
5
1u1db-qt (0.1.3) quantal; urgency=low6u1db-qt (0.1.3) quantal; urgency=low
2 * Add QtCreator Application templates and plugins.qmltypes to -dev package7 * Add QtCreator Application templates and plugins.qmltypes to -dev package
3 8
49
=== modified file 'debian/libu1db-qt5-doc.install'
--- debian/libu1db-qt5-doc.install 2013-04-22 14:36:13 +0000
+++ debian/libu1db-qt5-doc.install 2013-05-02 18:25:42 +0000
@@ -1,3 +1,4 @@
1usr/share/qt5/phrasebooks/*1usr/share/qt5/phrasebooks/*
2usr/share/u1db-qt/doc/html/*.index
2usr/share/u1db-qt/doc/html/*.html3usr/share/u1db-qt/doc/html/*.html
3usr/share/u1db-qt/doc/html/style/*.css4usr/share/u1db-qt/doc/html/style/*.css
45
=== modified file 'documentation/CMakeLists.txt'
--- documentation/CMakeLists.txt 2013-05-01 22:49:50 +0000
+++ documentation/CMakeLists.txt 2013-05-02 18:25:42 +0000
@@ -29,6 +29,10 @@
29 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"29 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"
30 FILES_MATCHING PATTERN "*.html"30 FILES_MATCHING PATTERN "*.html"
31 )31 )
32 install(DIRECTORY "${U1DB_DOCS}/"
33 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"
34 FILES_MATCHING PATTERN "*.index"
35 )
32 install(DIRECTORY "${U1DB_DOCS}/style/"36 install(DIRECTORY "${U1DB_DOCS}/style/"
33 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html/style"37 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html/style"
34 FILES_MATCHING PATTERN "*.css"38 FILES_MATCHING PATTERN "*.css"
3539
=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc 2013-04-23 13:11:30 +0000
+++ documentation/overview.qdoc 2013-05-02 18:25:42 +0000
@@ -25,7 +25,7 @@
25 \part General Topics25 \part General Topics
26 \list26 \list
27 \li \l {Tutorial} gives a quick start guide from storing a document27 \li \l {Tutorial} gives a quick start guide from storing a document
28 to querying a database and displaying it in Ubuntu Components.28 to querying a database and displaying it in \l {Ubuntu User Interface Toolkit}{Ubuntu Components}.
29 \li \l {Design Concepts} provides an overview of the design and29 \li \l {Design Concepts} provides an overview of the design and
30 terminology.30 terminology.
31 \endlist31 \endlist
3232
=== modified file 'documentation/u1db.qdocconf'
--- documentation/u1db.qdocconf 2013-04-22 12:22:04 +0000
+++ documentation/u1db.qdocconf 2013-05-02 18:25:42 +0000
@@ -1,5 +1,7 @@
1project = U1Db-Qt1project = U1Db-Qt
2description = U1Db-Qt plugin documentation2description = U1Db-Qt plugin documentation
3url = http://developer.ubuntu.com/api/ubuntu-12.10/qml/u1db/
4indexes = /usr/share/ubuntu-ui-toolkit/doc/html/ubuntu-user-interface-toolkit.index
35
4sourcedirs = ../src \6sourcedirs = ../src \
5 ../documentation7 ../documentation
68
=== modified file 'documentation/u1db.tutorial.qdoc'
--- documentation/u1db.tutorial.qdoc 2013-04-22 11:28:15 +0000
+++ documentation/u1db.tutorial.qdoc 2013-05-02 18:25:42 +0000
@@ -25,7 +25,7 @@
2525
26In 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.26In 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.
2727
28A 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). 28A 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}.
29 29
30\section1 2.0.1 Database Properties30\section1 2.0.1 Database Properties
3131

Subscribers

People subscribed via source and target branches

to all changes: