diff -Nru content-hub-0.0+14.04.20140402/debian/changelog content-hub-0.0+14.04.20140415/debian/changelog --- content-hub-0.0+14.04.20140402/debian/changelog 2014-04-15 23:32:13.000000000 +0000 +++ content-hub-0.0+14.04.20140415/debian/changelog 2014-04-15 23:32:14.000000000 +0000 @@ -1,3 +1,13 @@ +content-hub (0.0+14.04.20140415-0ubuntu1) trusty; urgency=low + + [ Michael Sheldon ] + * Fixes the clipping setting on the ResponsiveGridView when being used + with dynamically loaded ContentPeerModels. + * Excludes ResponsiveGridView from documentation creation and provides + additional summaries for QML components. + + -- Ubuntu daily release Tue, 15 Apr 2014 22:01:11 +0000 + content-hub (0.0+14.04.20140402-0ubuntu2) trusty; urgency=medium * No-change rebuild for shlib changes in qtbase and qtdeclarative. diff -Nru content-hub-0.0+14.04.20140402/doc/qml/ubuntu-content-hub.qdocconf.in content-hub-0.0+14.04.20140415/doc/qml/ubuntu-content-hub.qdocconf.in --- content-hub-0.0+14.04.20140402/doc/qml/ubuntu-content-hub.qdocconf.in 2014-04-02 14:45:59.000000000 +0000 +++ content-hub-0.0+14.04.20140415/doc/qml/ubuntu-content-hub.qdocconf.in 2014-04-15 22:01:01.000000000 +0000 @@ -1,6 +1,7 @@ project = Ubuntu Content QML API description = Ubuntu Content API +# QDoc 5.2 will only process these if they're relative paths sourcedirs = ../../../doc/qml/pages ../../../import exampledirs = ../../../examples/ @@ -9,6 +10,9 @@ examples.fileextensions = "*.js *.qml" examples.imageextensions = "*.png *.jpeg *.jpg" +# But... QDoc 5.2 will also only process this if it's an absolute path +excludefiles = @CMAKE_SOURCE_DIR@/import/Ubuntu/Content/ResponsiveGridView.qml + outputdir = html outputformat = HTML diff -Nru content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contenthandler.cpp content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contenthandler.cpp --- content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contenthandler.cpp 2014-04-02 14:46:42.000000000 +0000 +++ content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contenthandler.cpp 2014-04-15 22:01:01.000000000 +0000 @@ -21,6 +21,7 @@ \qmltype ContentHandler \instantiates ContentHandler \inqmlmodule Ubuntu.Content + \brief Describes the type of transfer operation to perform \sa ContentHub diff -Nru content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contenthub.cpp content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contenthub.cpp --- content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contenthub.cpp 2014-04-02 14:46:42.000000000 +0000 +++ content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contenthub.cpp 2014-04-15 22:01:01.000000000 +0000 @@ -32,6 +32,7 @@ * \qmltype ContentHub * \instantiates ContentHub * \inqmlmodule Ubuntu.Content + * \brief The central manager for all content operations * * Example usage for importing content: * \qml diff -Nru content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contentscope.cpp content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contentscope.cpp --- content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contentscope.cpp 2014-04-02 14:46:42.000000000 +0000 +++ content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contentscope.cpp 2014-04-15 22:01:01.000000000 +0000 @@ -21,6 +21,7 @@ \qmltype ContentScope \instantiates ContentScope \inqmlmodule Ubuntu.Content + \brief Used with a ContentStore to specify the destination location for a transfer \sa ContentStore diff -Nru content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contentstore.cpp content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contentstore.cpp --- content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contentstore.cpp 2014-04-02 14:46:42.000000000 +0000 +++ content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contentstore.cpp 2014-04-15 22:01:01.000000000 +0000 @@ -23,6 +23,7 @@ * \qmltype ContentStore * \instantiates ContentStore * \inqmlmodule Ubuntu.Content + * \brief Sets the type of location that content should be transferred to * * A ContentStore allows for the permanent storage of a transfered item. * diff -Nru content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contenttransfer.cpp content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contenttransfer.cpp --- content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contenttransfer.cpp 2014-04-02 14:46:42.000000000 +0000 +++ content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contenttransfer.cpp 2014-04-15 22:01:01.000000000 +0000 @@ -24,6 +24,7 @@ * \qmltype ContentTransfer * \instantiates ContentTransfer * \inqmlmodule Ubuntu.Content + * \brief Represents a transfer of content between two ContentPeers * * See documentation for ContentHub */ diff -Nru content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contenttype.cpp content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contenttype.cpp --- content-hub-0.0+14.04.20140402/import/Ubuntu/Content/contenttype.cpp 2014-04-02 14:46:42.000000000 +0000 +++ content-hub-0.0+14.04.20140415/import/Ubuntu/Content/contenttype.cpp 2014-04-15 22:01:01.000000000 +0000 @@ -21,6 +21,7 @@ \qmltype ContentType \instantiates ContentType \inqmlmodule Ubuntu.Content + \brief Describes the type of content to transfer \sa ContentHub diff -Nru content-hub-0.0+14.04.20140402/import/Ubuntu/Content/ResponsiveGridView.qml content-hub-0.0+14.04.20140415/import/Ubuntu/Content/ResponsiveGridView.qml --- content-hub-0.0+14.04.20140402/import/Ubuntu/Content/ResponsiveGridView.qml 2014-04-02 14:44:45.000000000 +0000 +++ content-hub-0.0+14.04.20140415/import/Ubuntu/Content/ResponsiveGridView.qml 2014-04-15 22:00:47.000000000 +0000 @@ -33,9 +33,6 @@ property alias delegate: gridView.delegate readonly property int cellWidth: gridView.cellWidth readonly property int cellHeight: gridView.cellHeight - readonly property int totalContentHeight: { - return contentHeightForRows(Math.ceil(gridView.model.count / columns)) - } property alias interactive: gridView.interactive readonly property alias flicking: gridView.flicking readonly property alias moving: gridView.moving @@ -58,7 +55,10 @@ rightMargin: margin/2 topMargin: verticalSpacing } - clip: parent.height != totalContentHeight + + onModelChanged: { + clip = parent.height != contentHeightForRows(Math.ceil(model.count / columns)) + } function pixelToGU(value) { return Math.floor(value / units.gu(1));