← Back to branch summary

~content-hub-team/content-hub/trunk

~content-hub-team/content-hub/trunk

Viewing all changes in revision 49.

Committer: Tarmac
Author(s): Ken VanDine
Date: 2013-09-30 18:39:00 UTC
mfrom: (48.1.1 content-hub-lp1231368)
Revision ID: tarmac-20130930183900-61vw3dr45uph3six

Pulled back in all the changes that were reverted in rev 47. Bug (LP: #1231368) seemed to be caused by gallery-app needing a rebuild against this version of content-hub.

Approved by PS Jenkins bot, Günter Schwann.

files added:
import/Ubuntu/Content/contentstore.cpp

import/Ubuntu/Content/contentstore.h

tests/acceptance-tests/test_utils.cpp

files modified:
CMakeLists.txt

examples/import-qml/import.qml

examples/importer/example.cpp

examples/importer/exampleimporter.cpp

import/Ubuntu/Content/CMakeLists.txt

import/Ubuntu/Content/contenthub.cpp

import/Ubuntu/Content/contenthub.h

import/Ubuntu/Content/contenthubplugin.cpp

import/Ubuntu/Content/contenttransfer.cpp

import/Ubuntu/Content/contenttransfer.h

import/Ubuntu/Content/contenttype.h

include/com/ubuntu/content/peer.h

include/com/ubuntu/content/store.h

include/com/ubuntu/content/transfer.h

src/com/ubuntu/content/CMakeLists.txt

src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml

src/com/ubuntu/content/detail/service.cpp

src/com/ubuntu/content/detail/transfer.cpp

src/com/ubuntu/content/detail/transfer.h

src/com/ubuntu/content/hub.cpp

src/com/ubuntu/content/peer.cpp

src/com/ubuntu/content/service/main.cpp

src/com/ubuntu/content/store.cpp

src/com/ubuntu/content/transfer.cpp

src/com/ubuntu/content/transfer_p.h

src/com/ubuntu/content/utils.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/app_hub_communication_transfer.cpp

Show diffs side-by-side

added added

removed removed

examples/import-qml/import.qml

examples/importer/example.cpp

examples/importer/exampleimporter.cpp

import/Ubuntu/Content/CMakeLists.txt

import/Ubuntu/Content/contenthub.cpp

import/Ubuntu/Content/contenthub.h

import/Ubuntu/Content/contenthubplugin.cpp

import/Ubuntu/Content/contentstore.cpp

import/Ubuntu/Content/contentstore.h

import/Ubuntu/Content/contenttransfer.cpp

import/Ubuntu/Content/contenttransfer.h

import/Ubuntu/Content/contenttype.h

include/com/ubuntu/content/peer.h

include/com/ubuntu/content/store.h

include/com/ubuntu/content/transfer.h

src/com/ubuntu/content/CMakeLists.txt

src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml

src/com/ubuntu/content/detail/service.cpp

src/com/ubuntu/content/detail/transfer.cpp

src/com/ubuntu/content/detail/transfer.h

src/com/ubuntu/content/hub.cpp

src/com/ubuntu/content/peer.cpp

src/com/ubuntu/content/service/main.cpp

src/com/ubuntu/content/store.cpp

src/com/ubuntu/content/transfer.cpp

src/com/ubuntu/content/transfer_p.h

src/com/ubuntu/content/utils.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/app_hub_communication_transfer.cpp

tests/acceptance-tests/test_utils.cpp

Older »