Remove QMediaImageViewer (SC break).

This class has turned out to be not very useful at this point in time.

Change-Id: Ic07132bdcd01a912a6dd1160c867979fd1307b6a
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

tests/auto/unit/multimedia.pro

@@ -34,6 +34,5 @@ SUBDIRS += \
 # these interfaces are exported.
 contains (QT_CONFIG, private_tests) {
     SUBDIRS += \
-        qdeclarativeaudio \
-        qmediaimageviewer
+        qdeclarativeaudio
 }

tests/auto/unit/multimediawidgets.pro

@@ -11,7 +11,6 @@ contains (QT_CONFIG, private_tests) {
   SUBDIRS += \
     qgraphicsvideoitem \
     qpaintervideosurface \
-    qmediaimageviewerwidgets \
-    qvideowidget \
+    qvideowidget
 }
 

tests/auto/unit/qmediaimageviewer/images.qrc

@@ -1,9 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/coverart.png</file>
-        <file>images/image.jpg</file>
-        <file>images/image.png</file>
-        <file>images/invalid.png</file>
-        <file>images/poster.png</file>
-    </qresource>
-</RCC>

tests/auto/unit/qmediaimageviewer/images/invalid.png

@@ -1,2 +0,0 @@
-This is not really a PNG file.
-

tests/auto/unit/qmediaimageviewer/qmediaimageviewer.pro

@@ -1,16 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qmediaimageviewer
-
-QT += multimedia-private network testlib
-CONFIG += no_private_qt_headers_warning
-
-SOURCES += tst_qmediaimageviewer.cpp
-
-RESOURCES += \
-        images.qrc
-
-!contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG
-
-wince* {
-    !contains(QT_CONFIG, no-jpeg): DEPLOYMENT_PLUGIN += qjpeg
-}

tests/auto/unit/qmediaimageviewerwidgets/images.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/image.png</file>
-    </qresource>
-</RCC>

tests/auto/unit/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro

@@ -1,17 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qmediaimageviewerwidgets
-
-QT += multimedia-private multimediawidgets-private network testlib
-CONFIG += no_private_qt_headers_warning
-
-SOURCES += tst_qmediaimageviewerwidgets.cpp
-
-RESOURCES += \
-        images.qrc
-
-!contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG
-
-wince* {
-    !contains(QT_CONFIG, no-jpeg): DEPLOYMENT_PLUGIN += qjpeg
-}
-QT+=widgets

tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp

@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//TESTED_COMPONENT=src/multimedia
-
-#include <qtmultimediadefs.h>
-#include <QtTest/QtTest>
-
-#include <QtCore/qdir.h>
-
-#include <qgraphicsvideoitem.h>
-#include <qmediaimageviewer.h>
-#include <private/qmediaimageviewerservice_p.h>
-#include <qmediaplaylist.h>
-#include <qmediaservice.h>
-#include <qvideorenderercontrol.h>
-#include <qvideowidget.h>
-#include <qvideowidgetcontrol.h>
-
-#include <qabstractvideosurface.h>
-#include <qvideosurfaceformat.h>
-
-QT_USE_NAMESPACE
-
-class tst_QMediaImageViewerWidgets : public QObject
-{
-    Q_OBJECT
-private slots:
-    void setVideoOutput();
-};
-
-class QtTestVideoSurface : public QAbstractVideoSurface
-{
-public:
-    QList<QVideoFrame::PixelFormat> supportedPixelFormats(
-            QAbstractVideoBuffer::HandleType handleType) const {
-        QList<QVideoFrame::PixelFormat> formats;
-        if (handleType == QAbstractVideoBuffer::NoHandle) {
-            formats << QVideoFrame::Format_RGB32;
-        }
-        return formats;
-    }
-
-    QVideoFrame frame() const { return m_frame;  }
-
-    bool present(const QVideoFrame &frame) { m_frame = frame; return true; }
-
-private:
-    QVideoFrame m_frame;
-};
-
-void tst_QMediaImageViewerWidgets::setVideoOutput()
-{
-    QMediaImageViewer imageViewer;
-    imageViewer.setMedia(QMediaContent(QUrl("qrc:///images/image.png")));
-
-    connect(&imageViewer, SIGNAL(mediaStatusChanged(QMediaImageViewer::MediaStatus)),
-            &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QTestEventLoop::instance().enterLoop(2);
-
-    if (imageViewer.mediaStatus() != QMediaImageViewer::LoadedMedia)
-        QSKIP("failed to load test image");
-
-    QVideoWidget widget;
-    QGraphicsVideoItem item;
-    QtTestVideoSurface surface;
-
-    imageViewer.setVideoOutput(&widget);
-    QVERIFY(widget.mediaObject() == &imageViewer);
-
-    imageViewer.setVideoOutput(&item);
-    QVERIFY(widget.mediaObject() == 0);
-    QVERIFY(item.mediaObject() == &imageViewer);
-
-    imageViewer.setVideoOutput(reinterpret_cast<QVideoWidget *>(0));
-    QVERIFY(item.mediaObject() == 0);
-
-    imageViewer.setVideoOutput(&widget);
-    QVERIFY(widget.mediaObject() == &imageViewer);
-
-    imageViewer.setVideoOutput(reinterpret_cast<QGraphicsVideoItem *>(0));
-    QVERIFY(widget.mediaObject() == 0);
-
-    imageViewer.setVideoOutput(&surface);
-    QVERIFY(surface.isActive());
-
-    imageViewer.setVideoOutput(reinterpret_cast<QAbstractVideoSurface *>(0));
-    QVERIFY(!surface.isActive());
-
-    imageViewer.setVideoOutput(&surface);
-    QVERIFY(surface.isActive());
-
-    imageViewer.setVideoOutput(&widget);
-    QVERIFY(!surface.isActive());
-    QVERIFY(widget.mediaObject() == &imageViewer);
-
-    imageViewer.setVideoOutput(&surface);
-    QVERIFY(surface.isActive());
-    QVERIFY(widget.mediaObject() == 0);
-}
-
-QTEST_MAIN(tst_QMediaImageViewerWidgets)
-
-#include "tst_qmediaimageviewerwidgets.moc"