← Back to branch summary

~phablet-team/ubuntu/trusty/qtmultimedia-opensource-src/use-camerabin1

« back to all changes in this revision

Viewing changes to src/multimedia/qmediaenumdebug.h

  • Committer: Package Import Robot
  • Author(s): Timo Jyrinki, Omer Akram, Timo Jyrinki
  • Date: 2014-02-28 09:03:43 UTC
  • mfrom: (1.1.2) (0.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20140228090343-autbuqdv64kr10gn
Tags: 5.2.1-0ubuntu1
https://launchpad.net/bugs/1193370
[ Omer Akram ]
* Run unittests during build, disable flaky tests (LP: #1193370)

[ Timo Jyrinki ]
* New upstream release
* Update *.install
* Merge Debian packaging 5.2.0-1, remaining changes:
  - Keep omitting OpenAL from build-deps
  - Don't build Qt Audio Engine
  - Enable tests
* Update symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/multimedia/qmediaenumdebug.h
55
55
#include <QtCore/qmetaobject.h>
56
56
#include <QtCore/qdebug.h>
57
57
 
58
 
QT_BEGIN_HEADER
59
58
QT_BEGIN_NAMESPACE
60
59
 
61
60
#ifndef QT_NO_DEBUG_STREAM
75
74
#endif //QT_NO_DEBUG_STREAM
76
75
 
77
76
QT_END_NAMESPACE
78
 
QT_END_HEADER
79
77
 
80
78
#endif
81
79