From eb5a508497dbb7acc3a056d02fc629f70dd0033b Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 7 Mar 2017 13:56:53 +0100
Subject: Fix build with -no-feature-graphicsview

Change-Id: Id5f0f90b816e878f828dd246b36ea3b4fc444e87
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/multimediawidgets/multimediawidgets.pro | 8 ++++++--
 src/multimediawidgets/qgraphicsvideoitem.h  | 9 ++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index c37868933..8e4a78278 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -11,17 +11,21 @@ PRIVATE_HEADERS += \
 PUBLIC_HEADERS += \
     qtmultimediawidgetdefs.h \
     qcameraviewfinder.h \
-    qgraphicsvideoitem.h \
     qvideowidgetcontrol.h \
     qvideowidget.h
 
 SOURCES += \
     qcameraviewfinder.cpp \
-    qgraphicsvideoitem.cpp \
     qpaintervideosurface.cpp \
     qvideowidgetcontrol.cpp \
     qvideowidget.cpp
 
+qtConfig(graphicsview) {
+    SOURCES        += qgraphicsvideoitem.cpp
+    PUBLIC_HEADERS += qgraphicsvideoitem.h
+}
+
+
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 
 load(qt_module)
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h
index 204993e7f..4a86d4412 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.h
+++ b/src/multimediawidgets/qgraphicsvideoitem.h
@@ -45,13 +45,11 @@
 #include <QtMultimediaWidgets/qvideowidget.h>
 #include <QtMultimedia/qmediabindableinterface.h>
 
-QT_BEGIN_NAMESPACE
-
-class QVideoSurfaceFormat;
-QT_END_NAMESPACE
+#if QT_CONFIG(graphicsview)
 
 QT_BEGIN_NAMESPACE
 
+class QVideoSurfaceFormat;
 class QGraphicsVideoItemPrivate;
 class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, public QMediaBindableInterface
 {
@@ -103,5 +101,6 @@ private:
 
 QT_END_NAMESPACE
 
+#endif // QT_CONFIG(graphicsview)
 
-#endif
+#endif // QGRAPHICSVIDEOITEM_H
-- 
cgit v1.2.3