Fix compilation with -no-opengl upstream/5.3.1
authorKai Koehne <kai.koehne@digia.com>
Mon, 30 Jun 2014 09:58:46 +0000 (11:58 +0200)
committerKai Koehne <kai.koehne@digia.com>
Tue, 1 Jul 2014 08:25:51 +0000 (10:25 +0200)
Change-Id: Ib8f39dcea58018f076d6a3fa733303958c707f1a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
src/plugins/avfoundation/mediaplayer/mediaplayer.pro
src/plugins/plugins.pro

index b5193b7..2670ece 100644 (file)
@@ -49,12 +49,17 @@ OBJECTIVE_SOURCES += \
 
     HEADERS += \
         avfvideorenderercontrol.h \
-        avfdisplaylink.h \
-        avfvideoframerenderer.h
+        avfdisplaylink.h
     OBJECTIVE_SOURCES += \
         avfvideorenderercontrol.mm \
-        avfdisplaylink.mm \
-        avfvideoframerenderer.mm
+        avfdisplaylink.mm
+
+    contains(QT_CONFIG, opengl.*) {
+        HEADERS += \
+            avfvideoframerenderer.h
+        OBJECTIVE_SOURCES += \
+            avfvideoframerenderer.mm
+    }
 }
 
 OTHER_FILES += \
index 88fc203..45aa95e 100644 (file)
@@ -48,7 +48,7 @@ mac:!simulator {
 
     config_avfoundation: SUBDIRS += avfoundation
 
-    !ios: SUBDIRS += qt7
+    contains(QT_CONFIG, opengl.*):!ios: SUBDIRS += qt7
 }
 
 config_resourcepolicy {