From 60fb11d9a2f5ff659a6ccffe01b4de16c1fb5929 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den.exter@jollamobile.com>
Date: Thu, 5 Dec 2013 15:38:14 +1000
Subject: Allow plugins to override the QML VideoOutput type.

Move QDeclarativeVideoOutput to the private QtMultimediaQuickTools
library to make the QDeclarativeVideoOutputBackend interface
implementable by a plugin.

Change-Id: I763c483a1fc9ec56dc7b8be0bc71523f029a36ee
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
---
 .../integration/qdeclarativevideooutput/qdeclarativevideooutput.pro    | 3 ---
 .../qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp            | 2 +-
 .../qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro  | 3 ---
 .../tst_qdeclarativevideooutput_window.cpp                             | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
index b9be929ea..573e5559e 100644
--- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
+++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
@@ -3,9 +3,6 @@ TARGET = tst_qdeclarativevideooutput
 QT += multimedia-private qml testlib quick
 CONFIG += testcase
 
-OTHER_FILES += \
-        ../../../../src/imports/multimedia/qdeclarativevideooutput_p.h
-
 SOURCES += \
         tst_qdeclarativevideooutput.cpp
 
diff --git a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
index 05c507f25..5ee2481f4 100644
--- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
+++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
@@ -46,7 +46,7 @@
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
 
-#include "qdeclarativevideooutput_p.h"
+#include "private/qdeclarativevideooutput_p.h"
 
 #include <qabstractvideosurface.h>
 #include <qvideorenderercontrol.h>
diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
index 3cc5e0980..655fbc7b9 100644
--- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
+++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
@@ -3,9 +3,6 @@ TARGET = tst_qdeclarativevideooutput_window
 QT += multimedia-private qml testlib quick
 CONFIG += testcase
 
-OTHER_FILES += \
-        ../../../../src/imports/multimedia/qdeclarativevideooutput_p.h
-
 SOURCES += \
         tst_qdeclarativevideooutput_window.cpp
 
diff --git a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
index b4bcd5045..97a441ae5 100644
--- a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
+++ b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
@@ -42,7 +42,7 @@
 
 //TESTED_COMPONENT=plugins/declarative/multimedia
 
-#include "qdeclarativevideooutput_p.h"
+#include "private/qdeclarativevideooutput_p.h"
 #include <QtCore/qobject.h>
 #include <QtTest/qtest.h>
 #include <QtQml/qqmlengine.h>
-- 
cgit v1.2.3