Cleanup all maemo/meego specific code

Change-Id: I6c6f28084c6b030928eebc53c5d0009b168ede6a
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

4 files changed, 1 insertions, 1189 deletions

diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index 29ec710f5..c37868933 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -17,27 +17,11 @@ PUBLIC_HEADERS += \
 
 SOURCES += \
     qcameraviewfinder.cpp \
+    qgraphicsvideoitem.cpp \
     qpaintervideosurface.cpp \
     qvideowidgetcontrol.cpp \
     qvideowidget.cpp
 
-maemo6 {
-    qtConfig(opengles2) {
-        PRIVATE_HEADERS += qeglimagetexturesurface_p.h
-        SOURCES += qeglimagetexturesurface.cpp
-
-        SOURCES += qgraphicsvideoitem_maemo6.cpp
-
-        LIBS_PRIVATE += -lX11
-    } else {
-        SOURCES += qgraphicsvideoitem.cpp
-    }
-}
-
-!maemo* {
-    SOURCES += qgraphicsvideoitem.cpp
-}
-
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 
 load(qt_module)
diff --git a/src/multimediawidgets/qeglimagetexturesurface.cpp b/src/multimediawidgets/qeglimagetexturesurface.cpp
deleted file mode 100644
index 5e2073a48..000000000
--- a/src/multimediawidgets/qeglimagetexturesurface.cpp
+++ /dev/null
@@ -1,533 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qeglimagetexturesurface_p.h>
-#include <qpaintervideosurface_p.h>
-
-#include <QtCore/qmath.h>
-#include <QtCore/qvariant.h>
-#include <QtCore/qdebug.h>
-#include <QtGui/qpainter.h>
-#include <QtWidgets/qx11info_x11.h>
-#include <qvideosurfaceformat.h>
-
-
-QT_BEGIN_NAMESPACE
-
-//#define DEBUG_OMAPFB_SURFACE
-
-const QAbstractVideoBuffer::HandleType EGLImageTextureHandle =
-QAbstractVideoBuffer::HandleType(QAbstractVideoBuffer::UserHandle+3434);
-
-/*!
-    \class QEglImageTextureSurface
-    \internal
-*/
-
-/*!
-*/
-QEglImageTextureSurface::QEglImageTextureSurface(QObject *parent)
-    : QAbstractVideoSurface(parent)
-    , m_context(0)
-    , m_program(0)
-    , m_pixelFormat(QVideoFrame::Format_Invalid)
-    , m_ready(false)
-    , m_colorKey(49,0,49)
-    , m_fallbackSurface(0)
-    , m_fallbackSurfaceActive(false)
-{
-    m_fallbackSurface = new QPainterVideoSurface(this);
-}
-
-/*!
-*/
-QEglImageTextureSurface::~QEglImageTextureSurface()
-{
-    if (isActive())
-        stop();
-}
-
-/*!
-*/
-QList<QVideoFrame::PixelFormat> QEglImageTextureSurface::supportedPixelFormats(
-    QAbstractVideoBuffer::HandleType handleType) const
-{
-#ifdef DEBUG_OMAPFB_SURFACE
-    qDebug() << Q_FUNC_INFO << handleType;
-#endif
-
-    if (handleType == EGLImageTextureHandle) {
-        return QList<QVideoFrame::PixelFormat>()
-                << QVideoFrame::Format_RGB32
-                << QVideoFrame::Format_ARGB32;
-    }
-
-    return m_fallbackSurface->supportedPixelFormats(handleType);
-}
-
-const char *qt_glsl_eglTextureVertexShaderProgram =
-        "attribute highp vec4 vertexCoordArray;\n"
-        "attribute mediump vec2 textureCoordArray;\n"
-        "uniform highp mat4 positionMatrix;\n"
-        "varying mediump vec2 textureCoord;\n"
-        "void main (void)\n"
-        "{\n"
-        "   gl_Position = positionMatrix * vertexCoordArray;\n"
-        "   textureCoord = textureCoordArray;\n"
-        "}";
-
-static const char* qt_glsl_eglTextureShaderProgram =
-        "#extension GL_OES_EGL_image_external: enable\n"
-        "\n"
-        "uniform samplerExternalOES texRgb;\n"
-        "varying mediump vec2 textureCoord;\n"
-        "\n"
-        "void main (void)\n"
-        "{\n"
-        "    gl_FragColor = texture2D(texRgb, textureCoord);\n"
-        "}";
-
-
-/*!
-*/
-bool QEglImageTextureSurface::start(const QVideoSurfaceFormat &format)
-{
-#ifdef DEBUG_OMAPFB_SURFACE
-    qDebug() << Q_FUNC_INFO << format;
-#endif
-
-    m_fallbackSurfaceActive = false;
-    if (format.handleType() != EGLImageTextureHandle) {
-        qWarning() << Q_FUNC_INFO << "Non EGLImageTextureHandle based format requested, fallback to QPainterVideoSurface";
-        connect(m_fallbackSurface, SIGNAL(activeChanged(bool)),
-                this, SIGNAL(activeChanged(bool)));
-        connect(m_fallbackSurface, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)),
-                this, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)));
-        connect(m_fallbackSurface, SIGNAL(supportedFormatsChanged()),
-                this, SIGNAL(supportedFormatsChanged()));
-        connect(m_fallbackSurface, SIGNAL(nativeResolutionChanged(QSize)),
-                this, SIGNAL(nativeResolutionChanged(QSize)));
-        connect(m_fallbackSurface, SIGNAL(frameChanged()),
-                this, SIGNAL(frameChanged()));
-
-        if (m_fallbackSurface->start(format)) {
-            m_fallbackSurfaceActive = true;
-            QAbstractVideoSurface::start(format);
-        } else {
-            qWarning() << Q_FUNC_INFO << "failed to start video surface:" << m_fallbackSurface->error();
-            setError(m_fallbackSurface->error());
-
-            disconnect(m_fallbackSurface, SIGNAL(activeChanged(bool)),
-                       this, SIGNAL(activeChanged(bool)));
-            disconnect(m_fallbackSurface, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)),
-                       this, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)));
-            disconnect(m_fallbackSurface, SIGNAL(supportedFormatsChanged()),
-                       this, SIGNAL(supportedFormatsChanged()));
-            disconnect(m_fallbackSurface, SIGNAL(nativeResolutionChanged(QSize)),
-                       this, SIGNAL(nativeResolutionChanged(QSize)));
-            disconnect(m_fallbackSurface, SIGNAL(frameChanged()),
-                       this, SIGNAL(frameChanged()));
-        }
-
-        return m_fallbackSurfaceActive;
-    }
-
-    QAbstractVideoSurface::Error error = NoError;
-
-    if (isActive())
-        stop();
-
-    if (format.frameSize().isEmpty()) {
-        setError(UnsupportedFormatError);
-    } else if (m_context) {
-        m_context->makeCurrent();
-        m_program = new QGLShaderProgram(m_context, this);
-
-        if (!m_program->addShaderFromSourceCode(QGLShader::Vertex, qt_glsl_eglTextureVertexShaderProgram)) {
-            qWarning("QOmapFbVideoSurface: Vertex shader compile error %s",
-                     qPrintable(m_program->log()));
-            error = ResourceError;
-        }
-
-        if (error == NoError
-                && !m_program->addShaderFromSourceCode(QGLShader::Fragment, qt_glsl_eglTextureShaderProgram)) {
-            qWarning("QOmapFbVideoSurface: Vertex shader compile error %s",
-                     qPrintable(m_program->log()));
-            error = QAbstractVideoSurface::ResourceError;
-        }
-
-        if (error == NoError) {
-            m_program->bindAttributeLocation("textureCoordArray", 1);
-            if(!m_program->link()) {
-                qWarning("QOmapFbVideoSurface: Shader link error %s", qPrintable(m_program->log()));
-                m_program->removeAllShaders();
-                error = QAbstractVideoSurface::ResourceError;
-            }
-        }
-
-        if (error != QAbstractVideoSurface::NoError) {
-            delete m_program;
-            m_program = 0;
-        }
-    }
-
-    if (error == QAbstractVideoSurface::NoError) {
-        m_scanLineDirection = format.scanLineDirection();
-        m_frameSize = format.frameSize();
-        m_pixelFormat = format.pixelFormat();
-        m_frameSize = format.frameSize();
-        m_sourceRect = format.viewport();
-        m_ready = true;
-
-        return QAbstractVideoSurface::start(format);
-    }
-
-    QAbstractVideoSurface::stop();
-    return false;
-}
-
-/*!
-*/
-void QEglImageTextureSurface::stop()
-{
-#ifdef DEBUG_OMAPFB_SURFACE
-    qDebug() << Q_FUNC_INFO;
-#endif
-
-    if (m_fallbackSurfaceActive) {
-        m_fallbackSurface->stop();
-        m_fallbackSurfaceActive = false;
-
-        disconnect(m_fallbackSurface, SIGNAL(activeChanged(bool)),
-                   this, SIGNAL(activeChanged(bool)));
-        disconnect(m_fallbackSurface, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)),
-                   this, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)));
-        disconnect(m_fallbackSurface, SIGNAL(supportedFormatsChanged()),
-                   this, SIGNAL(supportedFormatsChanged()));
-        disconnect(m_fallbackSurface, SIGNAL(nativeResolutionChanged(QSize)),
-                   this, SIGNAL(nativeResolutionChanged(QSize)));
-        disconnect(m_fallbackSurface, SIGNAL(frameChanged()),
-                   this, SIGNAL(frameChanged()));
-
-        m_ready = false;
-        QAbstractVideoSurface::stop();
-    }
-
-    if (isActive()) {
-        if (m_context)
-            m_context->makeCurrent();
-        m_frame = QVideoFrame();
-
-        m_program->removeAllShaders();
-        delete m_program;
-        m_program = 0;
-        m_ready = false;
-
-        QAbstractVideoSurface::stop();
-    }
-}
-
-/*!
-*/
-bool QEglImageTextureSurface::present(const QVideoFrame &frame)
-{
-    if (m_fallbackSurfaceActive) {
-        if (m_fallbackSurface->present(frame)) {
-            return true;
-        } else {
-            setError(m_fallbackSurface->error());
-            stop();
-            return false;
-        }
-    }
-
-    if (!m_ready) {
-        if (!isActive())
-            setError(StoppedError);
-        else
-            m_frame = frame;
-    } else if (frame.isValid()
-               && (frame.pixelFormat() != m_pixelFormat || frame.size() != m_frameSize)) {
-        setError(IncorrectFormatError);
-        qWarning() << "Received frame of incorrect format, stopping the surface";
-
-        stop();
-    } else {
-        if (m_context)
-            m_context->makeCurrent();
-        m_frame = frame;
-        m_ready = false;
-        emit frameChanged();
-        return true;
-    }
-    return false;
-}
-
-/*!
-*/
-int QEglImageTextureSurface::brightness() const
-{
-    return m_fallbackSurface->brightness();
-}
-
-/*!
-*/
-void QEglImageTextureSurface::setBrightness(int brightness)
-{
-    m_fallbackSurface->setBrightness(brightness);
-}
-
-/*!
-*/
-int QEglImageTextureSurface::contrast() const
-{
-    return m_fallbackSurface->contrast();
-}
-
-/*!
-*/
-void QEglImageTextureSurface::setContrast(int contrast)
-{
-    m_fallbackSurface->setContrast(contrast);
-}
-
-/*!
-*/
-int QEglImageTextureSurface::hue() const
-{
-    return m_fallbackSurface->hue();
-}
-
-/*!
-*/
-void QEglImageTextureSurface::setHue(int hue)
-{
-    m_fallbackSurface->setHue(hue);
-}
-
-/*!
-*/
-int QEglImageTextureSurface::saturation() const
-{
-    return m_fallbackSurface->saturation();
-}
-
-/*!
-*/
-void QEglImageTextureSurface::setSaturation(int saturation)
-{
-    m_fallbackSurface->setSaturation(saturation);
-}
-
-/*!
-*/
-bool QEglImageTextureSurface::isReady() const
-{
-    return m_fallbackSurfaceActive ? m_fallbackSurface->isReady() : m_ready;
-}
-
-/*!
-*/
-void QEglImageTextureSurface::setReady(bool ready)
-{
-    m_ready = ready;
-    if (m_fallbackSurfaceActive)
-        m_fallbackSurface->setReady(ready);
-}
-
-/*!
-*/
-void QEglImageTextureSurface::paint(QPainter *painter, const QRectF &target, const QRectF &sourceRect)
-{
-    if (m_fallbackSurfaceActive) {
-        m_fallbackSurface->paint(painter, target, sourceRect);
-        return;
-    }
-
-    if (!isActive() || !m_frame.isValid()) {
-        painter->fillRect(target, QBrush(Qt::black));
-    } else {
-        const QRectF source(
-                    m_sourceRect.x() + m_sourceRect.width() * sourceRect.x(),
-                    m_sourceRect.y() + m_sourceRect.height() * sourceRect.y(),
-                    m_sourceRect.width() * sourceRect.width(),
-                    m_sourceRect.height() * sourceRect.height());
-
-        bool stencilTestEnabled = glIsEnabled(GL_STENCIL_TEST);
-        bool scissorTestEnabled = glIsEnabled(GL_SCISSOR_TEST);
-
-        painter->beginNativePainting();
-
-        if (stencilTestEnabled)
-            glEnable(GL_STENCIL_TEST);
-        if (scissorTestEnabled)
-            glEnable(GL_SCISSOR_TEST);
-
-        const int width = QGLContext::currentContext()->device()->width();
-        const int height = QGLContext::currentContext()->device()->height();
-
-        const QTransform transform = painter->deviceTransform();
-
-        const GLfloat wfactor = 2.0 / width;
-        const GLfloat hfactor = -2.0 / height;
-
-        const GLfloat positionMatrix[4][4] =
-        {
-            {
-                /*(0,0)*/ GLfloat(wfactor * transform.m11() - transform.m13()),
-                /*(0,1)*/ GLfloat(hfactor * transform.m12() + transform.m13()),
-                /*(0,2)*/ 0.0,
-                /*(0,3)*/ GLfloat(transform.m13())
-            }, {
-                /*(1,0)*/ GLfloat(wfactor * transform.m21() - transform.m23()),
-                /*(1,1)*/ GLfloat(hfactor * transform.m22() + transform.m23()),
-                /*(1,2)*/ 0.0,
-                /*(1,3)*/ GLfloat(transform.m23())
-            }, {
-                /*(2,0)*/ 0.0,
-                /*(2,1)*/ 0.0,
-                /*(2,2)*/ -1.0,
-                /*(2,3)*/ 0.0
-            }, {
-                /*(3,0)*/ GLfloat(wfactor * transform.dx() - transform.m33()),
-                /*(3,1)*/ GLfloat(hfactor * transform.dy() + transform.m33()),
-                /*(3,2)*/ 0.0,
-                /*(3,3)*/ GLfloat(transform.m33())
-            }
-        };
-
-        const GLfloat vTop = m_scanLineDirection == QVideoSurfaceFormat::TopToBottom
-                ? target.top()
-                : target.bottom() + 1;
-        const GLfloat vBottom = m_scanLineDirection == QVideoSurfaceFormat::TopToBottom
-                ? target.bottom() + 1
-                : target.top();
-
-
-        const GLfloat vertexCoordArray[] =
-        {
-            GLfloat(target.left())     , GLfloat(vBottom),
-            GLfloat(target.right() + 1), GLfloat(vBottom),
-            GLfloat(target.left())     , GLfloat(vTop),
-            GLfloat(target.right() + 1), GLfloat(vTop)
-        };
-
-        const GLfloat txLeft = source.left() / m_frameSize.width();
-        const GLfloat txRight = source.right() / m_frameSize.width();
-        const GLfloat txTop = m_scanLineDirection == QVideoSurfaceFormat::TopToBottom
-                ? source.top() / m_frameSize.height()
-                : source.bottom() / m_frameSize.height();
-        const GLfloat txBottom = m_scanLineDirection == QVideoSurfaceFormat::TopToBottom
-                ? source.bottom() / m_frameSize.height()
-                : source.top() / m_frameSize.height();
-
-        const GLfloat textureCoordArray[] =
-        {
-            txLeft , txBottom,
-            txRight, txBottom,
-            txLeft , txTop,
-            txRight, txTop
-        };
-
-        m_program->bind();
-
-        m_program->enableAttributeArray("vertexCoordArray");
-        m_program->enableAttributeArray("textureCoordArray");
-        m_program->setAttributeArray("vertexCoordArray", vertexCoordArray, 2);
-        m_program->setAttributeArray("textureCoordArray", textureCoordArray, 2);
-        m_program->setUniformValue("positionMatrix", positionMatrix);
-        m_program->setUniformValue("texRgb", 0);
-
-        //map() binds the external texture
-        m_frame.map(QAbstractVideoBuffer::ReadOnly);
-
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
-        //it's necessary to unbind the external texture
-        m_frame.unmap();
-
-        m_program->release();
-
-        painter->endNativePainting();
-    }
-}
-
-/*!
-    \fn QEglImageTextureSurface::frameChanged()
-*/
-
-/*!
-*/
-const QGLContext *QEglImageTextureSurface::glContext() const
-{
-    return m_context;
-}
-
-/*!
-*/
-void QEglImageTextureSurface::setGLContext(QGLContext *context)
-{
-    if (m_context == context)
-        return;
-
-    stop();
-
-    m_context = context;
-
-    m_fallbackSurface->setGLContext(context);
-    if (m_fallbackSurface->supportedShaderTypes() & QPainterVideoSurface::GlslShader) {
-        m_fallbackSurface->setShaderType(QPainterVideoSurface::GlslShader);
-    } else {
-        m_fallbackSurface->setShaderType(QPainterVideoSurface::FragmentProgramShader);
-    }
-
-    emit supportedFormatsChanged();
-}
-
-void QEglImageTextureSurface::viewportDestroyed()
-{
-    m_context = 0;
-    m_fallbackSurface->viewportDestroyed();
-
-    setError(ResourceError);
-    stop();
-}
-
-#include "moc_qeglimagetexturesurface_p.cpp"
-QT_END_NAMESPACE
diff --git a/src/multimediawidgets/qeglimagetexturesurface_p.h b/src/multimediawidgets/qeglimagetexturesurface_p.h
deleted file mode 100644
index 8affe4dc3..000000000
--- a/src/multimediawidgets/qeglimagetexturesurface_p.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QEGLIMAGETEXTURESURFACE_P_H
-#define QEGLIMAGETEXTURESURFACE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qtmultimediawidgetdefs.h>
-#include <QtCore/qsize.h>
-#include <QtGui/qimage.h>
-#include <QtGui/qmatrix4x4.h>
-#include <QtGui/qpaintengine.h>
-
-#include <QtOpenGL/qglshaderprogram.h>
-
-#include <qabstractvideosurface.h>
-#include <qvideosurfaceformat.h>
-#include <qvideoframe.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGLContext;
-class QGLShaderProgram;
-class QPainterVideoSurface;
-
-class QEglImageTextureSurface : public QAbstractVideoSurface
-{
-    Q_OBJECT
-public:
-    explicit QEglImageTextureSurface(QObject *parent = 0);
-    ~QEglImageTextureSurface();
-
-    QList<QVideoFrame::PixelFormat> supportedPixelFormats(
-            QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const;
-
-    bool start(const QVideoSurfaceFormat &format);
-    void stop();
-
-    bool present(const QVideoFrame &frame);
-
-    int brightness() const;
-    void setBrightness(int brightness);
-
-    int contrast() const;
-    void setContrast(int contrast);
-
-    int hue() const;
-    void setHue(int hue);
-
-    int saturation() const;
-    void setSaturation(int saturation);
-
-    bool isReady() const;
-    void setReady(bool ready);
-
-    void paint(QPainter *painter, const QRectF &target, const QRectF &source = QRectF(0, 0, 1, 1));
-
-    const QGLContext *glContext() const;
-    void setGLContext(QGLContext *context);
-
-    bool isOverlayEnabled() const;
-    void setOverlayEnabled(bool enabled);
-
-    QRect displayRect() const;
-    void setDisplayRect(const QRect &rect);
-
-public Q_SLOTS:
-    void viewportDestroyed();
-
-Q_SIGNALS:
-    void frameChanged();
-
-private:
-    QGLContext *m_context;
-    QGLShaderProgram *m_program;
-
-    QVideoFrame m_frame;
-
-    QVideoFrame::PixelFormat m_pixelFormat;
-    QVideoSurfaceFormat::Direction m_scanLineDirection;
-    QSize m_frameSize;
-    QRect m_sourceRect;
-    bool m_ready;
-
-    QRect m_viewport;
-    QRect m_displayRect;
-    QColor m_colorKey;
-
-    QPainterVideoSurface *m_fallbackSurface;
-    bool m_fallbackSurfaceActive;
-};
-
-QT_END_NAMESPACE
-
-
-#endif
diff --git a/src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp b/src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp
deleted file mode 100644
index caedaeee1..000000000
--- a/src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qgraphicsvideoitem.h"
-
-#include <QtCore/qcoreevent.h>
-#include <QtCore/qpointer.h>
-#include <QtCore/qbasictimer.h>
-
-#include <QtWidgets/qgraphicsscene.h>
-
-#include <qmediaobject.h>
-#include <qmediaservice.h>
-#include <qpaintervideosurface_p.h>
-#include <qeglimagetexturesurface_p.h>
-#include <qvideorenderercontrol.h>
-
-#include <qvideosurfaceformat.h>
-
-#include <X11/Xlib.h>
-
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
-#include <QtOpenGL/qgl.h>
-#endif
-
-//#define ENABLE_OVERLAY
-
-namespace
-{
-//XInitThreads is necessary for gltexturesink element.
-//To ensure it's called before main() it's better to link to
-//libQtMultimedia.so directly, not when QML multimedia plugin is loaded.
-class InitThreads
-{
-public:
-    InitThreads()
-    {
-        XInitThreads();
-    }
-} _initThreads;
-}
-
-Q_DECLARE_METATYPE(QVideoSurfaceFormat)
-
-QT_BEGIN_NAMESPACE
-
-class QGraphicsVideoItemPrivate
-{
-public:
-    QGraphicsVideoItemPrivate()
-        : q_ptr(0)
-        , surface(0)
-        , mediaObject(0)
-        , service(0)
-        , rendererControl(0)
-        , aspectRatioMode(Qt::KeepAspectRatio)
-        , updatePaintDevice(true)
-        , rect(0.0, 0.0, 320, 240)
-    {
-    }
-
-    QGraphicsVideoItem *q_ptr;
-
-    QEglImageTextureSurface *surface;
-    QPointer<QMediaObject> mediaObject;
-    QMediaService *service;
-    QVideoRendererControl *rendererControl;
-    Qt::AspectRatioMode aspectRatioMode;
-    bool updatePaintDevice;
-    QRectF rect;
-    QRectF boundingRect;
-    QRectF sourceRect;
-    QSizeF nativeSize;
-
-    void clearService();
-    void updateRects();
-
-    void _q_present();
-    void _q_formatChanged(const QVideoSurfaceFormat &format);
-    void _q_updateNativeSize();
-    void _q_serviceDestroyed();
-};
-
-void QGraphicsVideoItemPrivate::clearService()
-{
-    if (rendererControl) {
-        surface->stop();
-        rendererControl->setSurface(0);
-        service->releaseControl(rendererControl);
-        rendererControl = 0;
-    }
-    if (service) {
-        QObject::disconnect(service, SIGNAL(destroyed()), q_ptr, SLOT(_q_serviceDestroyed()));
-        service = 0;
-    }
-}
-
-void QGraphicsVideoItemPrivate::updateRects()
-{
-    q_ptr->prepareGeometryChange();
-
-    if (nativeSize.isEmpty()) {
-        //this is necessary for item to receive the
-        //first paint event and configure video surface.
-        boundingRect = rect;
-    } else if (aspectRatioMode == Qt::IgnoreAspectRatio) {
-        boundingRect = rect;
-        sourceRect = QRectF(0, 0, 1, 1);
-    } else if (aspectRatioMode == Qt::KeepAspectRatio) {
-        QSizeF size = nativeSize;
-        size.scale(rect.size(), Qt::KeepAspectRatio);
-
-        boundingRect = QRectF(0, 0, size.width(), size.height());
-        boundingRect.moveCenter(rect.center());
-
-        sourceRect = QRectF(0, 0, 1, 1);
-    } else if (aspectRatioMode == Qt::KeepAspectRatioByExpanding) {
-        boundingRect = rect;
-
-        QSizeF size = rect.size();
-        size.scale(nativeSize, Qt::KeepAspectRatio);
-
-        sourceRect = QRectF(
-                0, 0, size.width() / nativeSize.width(), size.height() / nativeSize.height());
-        sourceRect.moveCenter(QPointF(0.5, 0.5));
-    }
-}
-
-void QGraphicsVideoItemPrivate::_q_present()
-{
-    if (q_ptr->isObscured()) {
-        q_ptr->update(boundingRect);
-        surface->setReady(true);
-    } else {
-        q_ptr->update(boundingRect);
-    }
-}
-
-void QGraphicsVideoItemPrivate::_q_updateNativeSize()
-{
-    QSize size = surface->surfaceFormat().sizeHint();
-    if (size.isEmpty())
-        size = rendererControl->property("nativeSize").toSize();
-
-    if (nativeSize != size) {
-        nativeSize = size;
-
-        updateRects();
-        emit q_ptr->nativeSizeChanged(nativeSize);
-    }
-}
-
-void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
-{
-    rendererControl = 0;
-    service = 0;
-
-    surface->stop();
-}
-
-
-/*
-    \class QGraphicsVideoItem
-
-
-    \brief The QGraphicsVideoItem class provides a graphics item which display video produced by a QMediaObject.
-
-    \inmodule QtMultimediaWidgets
-    \ingroup multimedia
-
-    Attaching a QGraphicsVideoItem to a QMediaObject allows it to display
-    the video or image output of that media object.  A QGraphicsVideoItem
-    is attached to a media object by passing a pointer to the QMediaObject
-    to the setMediaObject() function.
-
-    \code
-    player = new QMediaPlayer(this);
-
-    QGraphicsVideoItem *item = new QGraphicsVideoItem;
-    player->setVideoOutput(item);
-    graphicsView->scene()->addItem(item);
-    graphicsView->show();
-
-    player->setMedia(video);
-    player->play();
-    \endcode
-
-    \b {Note}: Only a single display output can be attached to a media
-    object at one time.
-
-    \sa QMediaObject, QMediaPlayer, QVideoWidget
-*/
-
-/*
-    Constructs a graphics item that displays video.
-
-    The \a parent is passed to QGraphicsItem.
-*/
-QGraphicsVideoItem::QGraphicsVideoItem(QGraphicsItem *parent)
-    : QGraphicsObject(parent)
-    , d_ptr(new QGraphicsVideoItemPrivate)
-{
-    d_ptr->q_ptr = this;
-    d_ptr->surface = new QEglImageTextureSurface(this);
-
-    qRegisterMetaType<QVideoSurfaceFormat>();
-
-    connect(d_ptr->surface, SIGNAL(frameChanged()), this, SLOT(_q_present()));
-    connect(d_ptr->surface, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)),
-            this, SLOT(_q_updateNativeSize()), Qt::QueuedConnection);
-}
-
-/*
-    Destroys a video graphics item.
-*/
-QGraphicsVideoItem::~QGraphicsVideoItem()
-{
-    if (d_ptr->rendererControl) {
-        d_ptr->rendererControl->setSurface(0);
-        d_ptr->service->releaseControl(d_ptr->rendererControl);
-    }
-
-    delete d_ptr->surface;
-    delete d_ptr;
-}
-
-/*
-    \property QGraphicsVideoItem::mediaObject
-    \brief the media object which provides the video displayed by a graphics
-    item.
-*/
-
-QMediaObject *QGraphicsVideoItem::mediaObject() const
-{
-    return d_func()->mediaObject;
-}
-
-/*
-  \internal
-*/
-bool QGraphicsVideoItem::setMediaObject(QMediaObject *object)
-{
-    Q_D(QGraphicsVideoItem);
-
-    if (object == d->mediaObject)
-        return true;
-
-    d->clearService();
-
-    d->mediaObject = object;
-
-    if (d->mediaObject) {
-        d->service = d->mediaObject->service();
-
-        if (d->service) {
-            QMediaControl *control = d->service->requestControl(QVideoRendererControl_iid);
-            if (control) {
-                d->rendererControl = qobject_cast<QVideoRendererControl *>(control);
-
-                if (d->rendererControl) {
-                    connect(d->rendererControl, SIGNAL(nativeSizeChanged()),
-                            this, SLOT(_q_updateNativeSize()), Qt::QueuedConnection);
-                    d->_q_updateNativeSize();
-                    //don't set the surface untill the item is painted
-                    //at least once and the surface is configured
-                    if (!d->updatePaintDevice)
-                        d->rendererControl->setSurface(d->surface);
-                    else
-                        update(boundingRect());
-
-                    connect(d->service, SIGNAL(destroyed()), this, SLOT(_q_serviceDestroyed()));
-
-                    return true;
-                }
-                if (control)
-                    d->service->releaseControl(control);
-            }
-        }
-    }
-
-    d->mediaObject = 0;
-    return false;
-}
-
-/*
-    \property QGraphicsVideoItem::aspectRatioMode
-    \brief how a video is scaled to fit the graphics item's size.
-*/
-
-Qt::AspectRatioMode QGraphicsVideoItem::aspectRatioMode() const
-{
-    return d_func()->aspectRatioMode;
-}
-
-void QGraphicsVideoItem::setAspectRatioMode(Qt::AspectRatioMode mode)
-{
-    Q_D(QGraphicsVideoItem);
-
-    d->aspectRatioMode = mode;
-    d->updateRects();
-}
-
-/*
-    \property QGraphicsVideoItem::offset
-    \brief the video item's offset.
-
-    QGraphicsVideoItem will draw video using the offset for its top left
-    corner.
-*/
-
-QPointF QGraphicsVideoItem::offset() const
-{
-    return d_func()->rect.topLeft();
-}
-
-void QGraphicsVideoItem::setOffset(const QPointF &offset)
-{
-    Q_D(QGraphicsVideoItem);
-
-    d->rect.moveTo(offset);
-    d->updateRects();
-}
-
-/*
-    \property QGraphicsVideoItem::size
-    \brief the video item's size.
-
-    QGraphicsVideoItem will draw video scaled to fit size according to its
-    fillMode.
-*/
-
-QSizeF QGraphicsVideoItem::size() const
-{
-    return d_func()->rect.size();
-}
-
-void QGraphicsVideoItem::setSize(const QSizeF &size)
-{
-    Q_D(QGraphicsVideoItem);
-
-    d->rect.setSize(size.isValid() ? size : QSizeF(0, 0));
-    d->updateRects();
-}
-
-/*
-    \property QGraphicsVideoItem::nativeSize
-    \brief the native size of the video.
-*/
-
-QSizeF QGraphicsVideoItem::nativeSize() const
-{
-    return d_func()->nativeSize;
-}
-
-/*
-    \fn QGraphicsVideoItem::nativeSizeChanged(const QSizeF &size)
-
-    Signals that the native \a size of the video has changed.
-*/
-
-/*
-    \reimp
-*/
-QRectF QGraphicsVideoItem::boundingRect() const
-{
-    return d_func()->boundingRect;
-}
-
-/*
-    \reimp
-*/
-void QGraphicsVideoItem::paint(
-        QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-    Q_D(QGraphicsVideoItem);
-
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
-
-    if (d->surface && d->rendererControl && d->updatePaintDevice) {
-        d->updatePaintDevice = false;
-
-        if (widget)
-            d->rendererControl->setProperty("winId", qulonglong(widget->winId()));
-
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
-        if (widget)
-            connect(widget, SIGNAL(destroyed()), d->surface, SLOT(viewportDestroyed()));
-
-        d->surface->setGLContext(const_cast<QGLContext *>(QGLContext::currentContext()));
-#endif
-        if (d->rendererControl->surface() != d->surface)
-            d->rendererControl->setSurface(d->surface);
-    }
-
-
-    //overlay doesn't work reliably
-
-    //check if the item is obscured:
-#ifdef ENABLE_OVERLAY
-    if (!isObscured()) {
-        bool obscured = false;
-
-        if (scene()) {
-            const auto items = scene()->items(mapToScene(boundingRect()), Qt::IntersectsItemBoundingRect);
-            for (QGraphicsItem *item : items) {
-                if (item->flags() & QGraphicsItem::ItemHasNoContents)
-                    continue;
-
-                if (item == this)
-                    break;
-
-                if (collidesWithItem(item)) {
-                    obscured = true;
-                    break;
-                }
-            }
-        }
-
-        d->rendererControl->setProperty("overlayEnabled", !obscured);
-    }
-
-    if (d->rendererControl->property("overlayEnabled").toBool()) {
-        QTransform transform = painter->combinedTransform();
-        QRect overlayRect = transform.mapRect(d->boundingRect).toRect();
-
-        d->rendererControl->setProperty("overlayGeometry", overlayRect);
-        QMetaObject::invokeMethod(d->rendererControl, "repaintOverlay");
-
-        painter->fillRect(d->boundingRect,
-                          d->rendererControl->property("colorKey").value<QColor>());
-    } else
-#endif //ENABLE_OVERLAY
-    {
-        if (d->surface && d->surface->isActive()) {
-            d->surface->paint(painter, d->boundingRect, d->sourceRect);
-            d->surface->setReady(true);
-        }
-    }
-}
-
-/*
-    \reimp
-
-    \internal
-*/
-QVariant QGraphicsVideoItem::itemChange(GraphicsItemChange change, const QVariant &value)
-{
-    return QGraphicsItem::itemChange(change, value);
-}
-
-/*
-  \internal
-*/
-void QGraphicsVideoItem::timerEvent(QTimerEvent *event)
-{
-    QGraphicsObject::timerEvent(event);
-}
-
-#include "moc_qgraphicsvideoitem.cpp"
-QT_END_NAMESPACE