From 124b6a4ee6661be4048329cca1bb5673d6897d2e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 30 Jun 2014 11:58:46 +0200 Subject: [PATCH] Fix compilation with -no-opengl Change-Id: Ib8f39dcea58018f076d6a3fa733303958c707f1a Reviewed-by: Oswald Buddenhagen --- .../avfoundation/mediaplayer/mediaplayer.pro | 13 +++++++++---- src/plugins/plugins.pro | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index b5193b73..2670ecea 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -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 += \ diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 88fc203d..45aa95ec 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -48,7 +48,7 @@ mac:!simulator { config_avfoundation: SUBDIRS += avfoundation - !ios: SUBDIRS += qt7 + contains(QT_CONFIG, opengl.*):!ios: SUBDIRS += qt7 } config_resourcepolicy {