diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-21 10:43:06 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-11-23 14:31:03 +0000 |
| commit | 24a1c04b69cec2d7aff70b4dc7e44a19313c62bf (patch) | |
| tree | d35083eee80fb686438e95e62e63828b83773bd9 /src/multimedia/controls | |
| parent | 5f5587940aefa29f375e49d0c2a450d0119f3681 (diff) | |
Add proper global headers for QtMultimedia
And deprecate the old qtmultimediadefs.h
Change-Id: I2d4164f3a51d8e5d1813413b4f6691a721386fdf
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/multimedia/controls')
| -rw-r--r-- | src/multimedia/controls/qmediastreamscontrol.h | 2 | ||||
| -rw-r--r-- | src/multimedia/controls/qmetadatareadercontrol.h | 2 | ||||
| -rw-r--r-- | src/multimedia/controls/qmetadatawritercontrol.h | 2 | ||||
| -rw-r--r-- | src/multimedia/controls/qradiodatacontrol.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/controls/qradiotunercontrol.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index ea12dd188..3c36e96cb 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -43,7 +43,7 @@ #include <QtMultimedia/qmediacontrol.h> #include <QtMultimedia/qmultimedia.h> -#include <QtMultimedia/qtmultimediadefs.h> +#include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmediaenumdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 9162d6454..455ce814e 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -45,7 +45,7 @@ #include <QtMultimedia/qmediaresource.h> -#include <QtMultimedia/qtmultimediadefs.h> +#include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmultimedia.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index 1c2f4cf69..da3413f77 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -45,7 +45,7 @@ #include <QtMultimedia/qmediaresource.h> -#include <QtMultimedia/qtmultimediadefs.h> +#include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmultimedia.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/controls/qradiodatacontrol.cpp b/src/multimedia/controls/qradiodatacontrol.cpp index 59c7c8cb1..eaa9aaed6 100644 --- a/src/multimedia/controls/qradiodatacontrol.cpp +++ b/src/multimedia/controls/qradiodatacontrol.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include <qtmultimediadefs.h> +#include <qtmultimediaglobal.h> #include "qradiodatacontrol.h" #include "qmediacontrol_p.h" diff --git a/src/multimedia/controls/qradiotunercontrol.cpp b/src/multimedia/controls/qradiotunercontrol.cpp index 5e5c1d5a7..8b9e865e1 100644 --- a/src/multimedia/controls/qradiotunercontrol.cpp +++ b/src/multimedia/controls/qradiotunercontrol.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include <qtmultimediadefs.h> +#include <qtmultimediaglobal.h> #include "qradiotunercontrol.h" #include "qmediacontrol_p.h" |