← 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/controls/qvideodeviceselectorcontrol.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/controls/qvideodeviceselectorcontrol.h
44
44
 
45
45
#include <QtMultimedia/qmediacontrol.h>
46
46
 
47
 
QT_BEGIN_HEADER
48
 
 
49
47
QT_BEGIN_NAMESPACE
50
48
 
51
49
// Required for QDoc workaround
83
81
 
84
82
QT_END_NAMESPACE
85
83
 
86
 
QT_END_HEADER
87
 
 
88
84
#endif // QVIDEODEVICESELECTORCONTROL_H