diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-06-30 11:58:46 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2014-07-01 10:25:51 +0200 |
| commit | 124b6a4ee6661be4048329cca1bb5673d6897d2e (patch) | |
| tree | 38da7cc6c28eeee5909e52f1123eee2a5b366f63 /src/plugins | |
| parent | dfd00bca7e5fef31a1ab1a01ef75a0718804474b (diff) | |
Fix compilation with -no-opengl
Change-Id: Ib8f39dcea58018f076d6a3fa733303958c707f1a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 13 | ||||
| -rw-r--r-- | 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 b5193b73d..2670eceaf 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 88fc203d5..45aa95ec7 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 { |