diff options
| author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2011-08-02 10:28:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 06:01:48 +0200 |
| commit | af84038bef9a60a6a4f4f7c2b43f5268923a1114 (patch) | |
| tree | 03580a64b20ce1ec8078f46d4e99ab1ca729c254 | |
| parent | ec29f594b4f51abab5482b1e1fa60dfc29c153a2 (diff) | |
Fixed compile error on Mac OS X Lion, missing include statement.
Also, don't try and build the quicktime/CG bits on QPA for now,
since that really doesn't seem to work.
Change-Id: If88b94bae3c092f2480318fa169250c03de44784
Reviewed-on: http://codereview.qt.nokia.com/2545
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
| -rw-r--r-- | src/multimediakit/effects/effects.pri | 6 | ||||
| -rw-r--r-- | src/multimediakit/multimediakit.pro | 2 | ||||
| -rw-r--r-- | src/multimediakit/qpaintervideosurface_mac.mm | 9 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 3 |
4 files changed, 13 insertions, 7 deletions
diff --git a/src/multimediakit/effects/effects.pri b/src/multimediakit/effects/effects.pri index 2b003a072..48c9906b6 100644 --- a/src/multimediakit/effects/effects.pri +++ b/src/multimediakit/effects/effects.pri @@ -14,9 +14,13 @@ unix:!mac { PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h SOURCES += effects/qsoundeffect_qmedia_p.cpp } -} else { +} else:!qpa { PRIVATE_HEADERS += effects/qsoundeffect_qsound_p.h SOURCES += effects/qsoundeffect_qsound_p.cpp +} else { + DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER + PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h + SOURCES += effects/qsoundeffect_qmedia_p.cpp } PRIVATE_HEADERS += \ diff --git a/src/multimediakit/multimediakit.pro b/src/multimediakit/multimediakit.pro index 7ff2660de..4cc1dbfdc 100644 --- a/src/multimediakit/multimediakit.pro +++ b/src/multimediakit/multimediakit.pro @@ -160,7 +160,7 @@ include(audio/audio.pri) include(video/video.pri) include(effects/effects.pri) -mac { +mac:!qpa { !simulator { HEADERS += qpaintervideosurface_mac_p.h OBJECTIVE_SOURCES += qpaintervideosurface_mac.mm diff --git a/src/multimediakit/qpaintervideosurface_mac.mm b/src/multimediakit/qpaintervideosurface_mac.mm index f366dad5c..02eabfe7d 100644 --- a/src/multimediakit/qpaintervideosurface_mac.mm +++ b/src/multimediakit/qpaintervideosurface_mac.mm @@ -39,6 +39,11 @@ ** ****************************************************************************/ +#include <AppKit/AppKit.h> +#include <QuartzCore/CIContext.h> +#include <CGLCurrent.h> +#include <OpenGL/gl.h> + #include "qpaintervideosurface_mac_p.h" #include <QtCore/qdatetime.h> @@ -51,10 +56,6 @@ #include <QtDebug> -#include <QuartzCore/CIContext.h> -#include <CGLCurrent.h> - - QT_BEGIN_NAMESPACE extern CGContextRef qt_mac_cg_context(const QPaintDevice *pdev); //qpaintdevice_mac.cpp diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 6ae546f72..bc82c60b3 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -41,5 +41,6 @@ unix:!mac { } mac:!simulator { - SUBDIRS += audiocapture qt7 + SUBDIRS += audiocapture + !qpa: SUBDIRS += qt7 } |