~ci-train-bot/thumbnailer/thumbnailer-ubuntu-yakkety-landing-072

« back to all changes in this revision

Viewing changes to include/utils/artgeneratorcommon.h

  • Committer: CI Train Bot
  • Author(s): Michi Henning
  • Date: 2015-09-15 11:04:11 UTC
  • mfrom: (125.1.2 landing150915)
  • Revision ID: ci-train-bot@canonical.com-20150915110411-233xw0fljaq7p2o0
Landing changes on devel to trunk.
Approved by: James Henstridge

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
{
26
26
namespace thumbnailer
27
27
{
28
 
namespace qml
 
28
namespace internal
29
29
{
30
30
 
31
31
QImage imageFromFd(int fd, QSize* realSize, const QSize& requestedSize);
 
32
 
32
33
}
33
34
}
34
35
}