diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:15:45 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:15:45 +0200 |
| commit | 0ef52f01029176a8fb8fbef2c22ae9350635ebe1 (patch) | |
| tree | fad805097d0e40ba57dcfb61ac3067737c7a2ae3 /src/multimedia/qmultimedia.h | |
| parent | cb324a50c920b275ef6c04162712b1a6f19bbe8d (diff) | |
| parent | 5c087bb6153b951e1c5709ee7f998819d08a6122 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
Diffstat (limited to 'src/multimedia/qmultimedia.h')
| -rw-r--r-- | src/multimedia/qmultimedia.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/multimedia/qmultimedia.h b/src/multimedia/qmultimedia.h index 22028be6c..be4737a70 100644 --- a/src/multimedia/qmultimedia.h +++ b/src/multimedia/qmultimedia.h @@ -47,7 +47,6 @@ #include <QtCore/qstring.h> #include <QtMultimedia/qtmultimediadefs.h> -#include <QtMultimedia/qmediametadata.h> QT_BEGIN_NAMESPACE |