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/plugins/avfoundation | |
| 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/plugins/avfoundation')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcameradebug.h | 2 | ||||
| -rw-r--r-- | src/plugins/avfoundation/camera/avfstoragelocation.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameradebug.h b/src/plugins/avfoundation/camera/avfcameradebug.h index 79bf8eb0e..8838122e0 100644 --- a/src/plugins/avfoundation/camera/avfcameradebug.h +++ b/src/plugins/avfoundation/camera/avfcameradebug.h @@ -40,7 +40,7 @@ #ifndef AVFDEBUG_H #define AVFDEBUG_H -#include "qtmultimediadefs.h" +#include "qtmultimediaglobal.h" #include <QtCore/qdebug.h> diff --git a/src/plugins/avfoundation/camera/avfstoragelocation.h b/src/plugins/avfoundation/camera/avfstoragelocation.h index e3267c1e7..76621983d 100644 --- a/src/plugins/avfoundation/camera/avfstoragelocation.h +++ b/src/plugins/avfoundation/camera/avfstoragelocation.h @@ -40,7 +40,7 @@ #ifndef AVFSTORAGE_H #define AVFSTORAGE_H -#include "qtmultimediadefs.h" +#include "qtmultimediaglobal.h" #include <QtCore/qdir.h> #include <QtMultimedia/qcamera.h> |