Move QVideoWindowControl out of widgets.

There is no widget dependency in it, and this enables the QML
Video element to support video overlays later.

Change-Id: I7ebcde350f9595a9f7c319663ff745930535a8a7
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

5 files changed, 9 insertions, 8 deletions

diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
index bf2118794..f3b3f73f2 100644
--- a/src/multimedia/controls/controls.pri
+++ b/src/multimedia/controls/controls.pri
@@ -30,6 +30,7 @@ PUBLIC_HEADERS += \
     controls/qvideodevicecontrol.h \
     controls/qvideoencodercontrol.h \
     controls/qvideorenderercontrol.h \
+    controls/qvideowindowcontrol.h \
     controls/qmediaaudioprobecontrol.h \
     controls/qmediavideoprobecontrol.h \
     controls/qmediaavailabilitycontrol.h
@@ -68,6 +69,7 @@ SOURCES += \
     controls/qvideodevicecontrol.cpp \
     controls/qvideoencodercontrol.cpp \
     controls/qvideorenderercontrol.cpp \
+    controls/qvideowindowcontrol.cpp \
     controls/qmediaaudioprobecontrol.cpp \
     controls/qmediavideoprobecontrol.cpp \
     controls/qmediaavailabilitycontrol.cpp \
diff --git a/src/multimediawidgets/qvideowindowcontrol.cpp b/src/multimedia/controls/qvideowindowcontrol.cpp
index a4ed8eca3..a4ed8eca3 100644
--- a/src/multimediawidgets/qvideowindowcontrol.cpp
+++ b/src/multimedia/controls/qvideowindowcontrol.cpp
diff --git a/src/multimediawidgets/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h
index 97c41a128..27d8eed26 100644
--- a/src/multimediawidgets/qvideowindowcontrol.h
+++ b/src/multimedia/controls/qvideowindowcontrol.h
@@ -43,9 +43,9 @@
 #define QVIDEOWINDOWCONTROL_H
 
 #include "qmediacontrol.h"
-#include "qvideowidget.h"
-
-#include <QtWidgets/qwidget.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qsize.h>
+#include <QtGui/qwindowdefs.h>
 
 QT_BEGIN_HEADER
 
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Multimedia)
 
 
-class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWindowControl : public QMediaControl
+class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl
 {
     Q_OBJECT
 
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index f6e34eec5..c130bc846 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -29,15 +29,13 @@ PUBLIC_HEADERS += \
     qcameraviewfinder.h \
     qgraphicsvideoitem.h \
     qvideowidgetcontrol.h \
-    qvideowidget.h \
-    qvideowindowcontrol.h
+    qvideowidget.h
 
 SOURCES += \
     qcameraviewfinder.cpp \
     qpaintervideosurface.cpp \
     qvideowidgetcontrol.cpp \
-    qvideowidget.cpp \
-    qvideowindowcontrol.cpp \
+    qvideowidget.cpp
 
 mac {
     # QtWidgets is not yet supported on Mac (!).
diff --git a/src/plugins/gstreamer/qgstreamervideowindow.h b/src/plugins/gstreamer/qgstreamervideowindow.h
index ec7bef533..8c962defa 100644
--- a/src/plugins/gstreamer/qgstreamervideowindow.h
+++ b/src/plugins/gstreamer/qgstreamervideowindow.h
@@ -46,6 +46,7 @@
 
 #include "qgstreamervideorendererinterface.h"
 #include <private/qgstreamerbushelper_p.h>
+#include <QtGui/qcolor.h>
 
 QT_BEGIN_NAMESPACE
 class QAbstractVideoSurface;