diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
| commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
| tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/gstreamer/camerabin/camerabin.pro | |
| parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
| parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabin.pro')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabin.pro | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro index d214d61c6..183ddf2d4 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -53,8 +53,6 @@ SOURCES += \ $$PWD/camerabininfocontrol.cpp qtConfig(gstreamer_photography) { - DEFINES += HAVE_GST_PHOTOGRAPHY - HEADERS += \ $$PWD/camerabinfocus.h \ $$PWD/camerabinexposure.h \ @@ -71,13 +69,7 @@ qtConfig(gstreamer_photography) { DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API } -qtConfig(gstreamer_encodingprofiles) { - DEFINES += HAVE_GST_ENCODING_PROFILES -} - qtConfig(linux_v4l) { - DEFINES += USE_V4L - HEADERS += \ $$PWD/camerabinv4limageprocessing.h |