diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-20 13:46:06 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-20 13:46:06 +0100 |
| commit | 5c0cca78f410e8a89d3216aeba916d73070398f4 (patch) | |
| tree | e21b54b36dde0825f9c07899c705dcbb91dcabbd /src/qtmultimediaquicktools/qtmultimediaquicktools.pro | |
| parent | 4e809d4be9bb60cb20e5c98e4b2664af8e1cc2f3 (diff) | |
| parent | 49bf444b44dac10602af0af862f0951835ea5895 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib250ceecd02291f752b7775f329f0f494c4aed38
Diffstat (limited to 'src/qtmultimediaquicktools/qtmultimediaquicktools.pro')
| -rw-r--r-- | src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index 7c8d07647..cb1f8106b 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -11,20 +11,23 @@ PRIVATE_HEADERS += \ HEADERS += \ $$PRIVATE_HEADERS \ - qdeclarativevideooutput_render_p.h \ - qdeclarativevideooutput_window_p.h \ - qsgvideonode_yuv_p.h \ - qsgvideonode_rgb_p.h \ - qsgvideonode_texture_p.h + qdeclarativevideooutput_window_p.h SOURCES += \ qsgvideonode_p.cpp \ qdeclarativevideooutput.cpp \ - qdeclarativevideooutput_render.cpp \ - qdeclarativevideooutput_window.cpp \ - qsgvideonode_yuv.cpp \ - qsgvideonode_rgb.cpp \ - qsgvideonode_texture.cpp + qdeclarativevideooutput_window.cpp + +qtConfig(opengl) { + SOURCES += qdeclarativevideooutput_render.cpp \ + qsgvideonode_rgb.cpp \ + qsgvideonode_yuv.cpp \ + qsgvideonode_texture.cpp + HEADERS += qdeclarativevideooutput_render_p.h \ + qsgvideonode_rgb_p.h \ + qsgvideonode_yuv_p.h \ + qsgvideonode_texture_p.h +} RESOURCES += \ qtmultimediaquicktools.qrc |