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/playback | |
| 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/playback')
| -rw-r--r-- | src/multimedia/playback/playlistfileparser_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediacontent.h | 2 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaplaylistioplugin_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaresource.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/playback/playlistfileparser_p.h b/src/multimedia/playback/playlistfileparser_p.h index 353da3eca..bdf95fe7a 100644 --- a/src/multimedia/playback/playlistfileparser_p.h +++ b/src/multimedia/playback/playlistfileparser_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qtmultimediadefs.h" +#include "qtmultimediaglobal.h" #include <QtNetwork/QNetworkRequest> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/playback/qmediacontent.h b/src/multimedia/playback/qmediacontent.h index 25db6ecf5..f7c086752 100644 --- a/src/multimedia/playback/qmediacontent.h +++ b/src/multimedia/playback/qmediacontent.h @@ -45,7 +45,7 @@ #include <QtMultimedia/qmediaresource.h> -#include <QtMultimedia/qtmultimediadefs.h> +#include <QtMultimedia/qtmultimediaglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/playback/qmediaplaylistioplugin_p.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h index 62bb6757a..73281b2bf 100644 --- a/src/multimedia/playback/qmediaplaylistioplugin_p.h +++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h @@ -54,7 +54,7 @@ #include <QtCore/qobject.h> #include <QtCore/qplugin.h> -#include <qtmultimediadefs.h> +#include <qtmultimediaglobal.h> #include "qmediacontent.h" diff --git a/src/multimedia/playback/qmediaresource.h b/src/multimedia/playback/qmediaresource.h index 83f998eb9..9740166c6 100644 --- a/src/multimedia/playback/qmediaresource.h +++ b/src/multimedia/playback/qmediaresource.h @@ -44,7 +44,7 @@ #include <QtCore/qmetatype.h> #include <QtNetwork/qnetworkrequest.h> -#include <QtMultimedia/qtmultimediadefs.h> +#include <QtMultimedia/qtmultimediaglobal.h> QT_BEGIN_NAMESPACE |