lp:~michael-sheldon/content-hub/qdoc-import-fix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:content-hub at revision 91

PS Jenkins bot: Approve (continuous-integration) on 2014-04-02

Ken VanDine: Pending requested 2014-04-02

Diff: 162 lines (+15/-12)

13 files modified

doc/qml/pages/mainpage.qdoc (+1/-1)
doc/qml/pages/moduledef.qdoc (+3/-0)
import/Ubuntu/Content/ContentPeerPicker.qml (+1/-1)
import/Ubuntu/Content/ContentTransferHint.qml (+1/-1)
import/Ubuntu/Content/contenthandler.cpp (+1/-1)
import/Ubuntu/Content/contenthub.cpp (+1/-1)
import/Ubuntu/Content/contentitem.cpp (+1/-1)
import/Ubuntu/Content/contentpeer.cpp (+1/-1)
import/Ubuntu/Content/contentpeermodel.cpp (+1/-1)
import/Ubuntu/Content/contentscope.cpp (+1/-1)
import/Ubuntu/Content/contentstore.cpp (+1/-1)
import/Ubuntu/Content/contenttransfer.cpp (+1/-1)
import/Ubuntu/Content/contenttype.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

79. By Michael Sheldon on 2014-04-02

Fix import statements in documentation (qdoc now ignores any version specified with \inqmlmodule in favour of the version given by \qmlmodule)

78. By Michael Sheldon on 2014-04-02

Fix typo in documentation example

77. By Michael Sheldon on 2014-03-27

Merge from trunk

76. By Michael Sheldon on 2014-03-27

Use relative paths for qdoc generation (qdoc in Qt 5.2 currently fails with absolute paths)

75. By PS Jenkins bot on 2014-03-07

Releasing 0.0+14.04.20140307-0ubuntu1

74. By PS Jenkins bot on 2014-03-07

No change rebuild against Qt 5.2.1.

73. By PS Jenkins bot on 2014-03-06

Releasing 0.0+14.04.20140306-0ubuntu1

72. By Ken VanDine on 2014-03-06

Changed defaults to a triplet used to build the appid. Bumped build depends
for libupstart-app-launch2-dev needed for converting the triplet to an appid.

71. By Ken VanDine on 2013-12-12

Added Type::Known::contacts. Note: there is no associated default
store for contacts under any scope. Data for contacts doesn't persist.

Approved by Renato Araujo Oliveira Filho, PS Jenkins bot.

70. By PS Jenkins bot on 2013-12-09

Releasing 0.0+14.04.20131209.1-0ubuntu1 (revision 69 from lp:content-hub).

Approved by PS Jenkins bot.