diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-05 17:22:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-06 05:26:01 +0100 |
| commit | c97f5f8c2e91c1b76d42583efaf232487d490060 (patch) | |
| tree | 533f1142282ebce38bbf7bd4356b4341530f30be /src/imports/multimedia/qsgvideonode_i420.cpp | |
| parent | bc7d964a053a3a37a0b286ee17ee15c9ef747c3e (diff) | |
Properly handle the case where QtWidgets is not available.
It does use a config test for now, just to make it clearer. The Mac
backend currently requires widgets, but most of the others should work
without it (just not supporting QVideoWidget/WindowControl).
The QVideoDeviceControl interface was modified to remove the QIcon
usage - it was never implemented.
Unfortunately even the QML examples need widgets for the wrapper
application, and will need to be ported to QtGui based wrapper.
Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/imports/multimedia/qsgvideonode_i420.cpp')
| -rw-r--r-- | src/imports/multimedia/qsgvideonode_i420.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/multimedia/qsgvideonode_i420.cpp b/src/imports/multimedia/qsgvideonode_i420.cpp index 931c62c8d..fae2c8723 100644 --- a/src/imports/multimedia/qsgvideonode_i420.cpp +++ b/src/imports/multimedia/qsgvideonode_i420.cpp @@ -44,7 +44,7 @@ #include <QtQuick/qsgmaterial.h> #include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLFunctions> -#include <QtOpenGL/qglshaderprogram.h> +#include <QtGui/QOpenGLShaderProgram> QList<QVideoFrame::PixelFormat> QSGVideoNodeFactory_I420::supportedPixelFormats( QAbstractVideoBuffer::HandleType handleType) const |