lp:~ken-vandine/content-hub/qdoc

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~content-hub-team/content-hub/trunk at revision 63

PS Jenkins bot: Approve (continuous-integration) on 2013-10-23

Günter Schwann (community): Approve on 2013-10-23

Diff: 2252 lines (+1823/-66)

17 files modified

debian/libcontent-hub-doc.install (+1/-1)
doc/CMakeLists.txt (+8/-3)
doc/qml/CMakeLists.txt (+25/-0)
doc/qml/css/base.css (+638/-0)
doc/qml/css/qtquick.css (+772/-0)
doc/qml/css/reset.css (+8/-0)
doc/qml/css/scratch.css (+61/-0)
doc/qml/pages/mainpage.qdoc (+125/-0)
doc/qml/ubuntu-content-hub.qdocconf.in (+47/-0)
import/Ubuntu/Content/ContentImportHint.qml (+1/-1)
import/Ubuntu/Content/contenthub.cpp (+23/-15)
import/Ubuntu/Content/contenthub.h (+4/-0)
import/Ubuntu/Content/contenthubplugin.cpp (+0/-3)
import/Ubuntu/Content/contentitem.cpp (+3/-3)
import/Ubuntu/Content/contentstore.cpp (+4/-7)
import/Ubuntu/Content/contenttransfer.cpp (+75/-21)
import/Ubuntu/Content/contenttype.cpp (+28/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

72. By Ken VanDine on 2013-10-23

Fixed annotations for overloaded importContent method

71. By Ken VanDine on 2013-10-23

merged id rename

70. By Ken VanDine on 2013-10-22

Merged QML bindings fixes

69. By Ken VanDine on 2013-10-22

Updated doc strings

68. By Ken VanDine on 2013-10-22

marked finishedImports and restoreImports as \internal to exclude from qdoc.

67. By Ken VanDine on 2013-10-22

Added introduction, architecture overview, examples and definitions to the QML docs

66. By Ken VanDine on 2013-10-21

syntax fix for mainpage

65. By Ken VanDine on 2013-10-21

added toplevel doc

64. By Ken VanDine on 2013-10-21

fixed build

63. By Ken VanDine on 2013-10-21

Tweaks for qdoc docs