diff options
Diffstat (limited to 'src/plugins/directshow/camera')
| -rw-r--r-- | src/plugins/directshow/camera/camera.pri | 2 | ||||
| -rw-r--r-- | src/plugins/directshow/camera/directshowcameraglobal.h (renamed from src/plugins/directshow/camera/directshowglobal.h) | 4 | ||||
| -rw-r--r-- | src/plugins/directshow/camera/dscamerasession.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri index c6b16da59..6c67a8fe2 100644 --- a/src/plugins/directshow/camera/camera.pri +++ b/src/plugins/directshow/camera/camera.pri @@ -13,7 +13,7 @@ HEADERS += \ $$PWD/dsvideodevicecontrol.h \ $$PWD/dsimagecapturecontrol.h \ $$PWD/dscamerasession.h \ - $$PWD/directshowglobal.h \ + $$PWD/directshowcameraglobal.h \ $$PWD/dscameraviewfindersettingscontrol.h \ $$PWD/dscameraimageprocessingcontrol.h diff --git a/src/plugins/directshow/camera/directshowglobal.h b/src/plugins/directshow/camera/directshowcameraglobal.h index 46d161336..75112a090 100644 --- a/src/plugins/directshow/camera/directshowglobal.h +++ b/src/plugins/directshow/camera/directshowcameraglobal.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef DIRECTSHOWGLOBAL_H -#define DIRECTSHOWGLOBAL_H +#ifndef DIRECTSHOWCAMERAGLOBAL_H +#define DIRECTSHOWCAMERAGLOBAL_H #include <QtCore/qglobal.h> diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index 9e1be9606..4208f934f 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -47,7 +47,7 @@ #include "dscamerasession.h" #include "dsvideorenderer.h" -#include "directshowglobal.h" +#include "directshowcameraglobal.h" QT_BEGIN_NAMESPACE |