From 04860b7a374c7e03af6d2e778f6402e7e5cf6268 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 5 Mar 2013 15:23:13 +0100 Subject: [PATCH] iOS: Fix build issues This also prevents anything meaningful from working, but it is a good starting point. Change-Id: Idaf495ec29f611ee5342c79318bc3ace1d852747 Reviewed-by: Yoann Lopes --- src/multimedia/audio/audio.pri | 4 ++-- src/multimedia/audio/qaudiodevicefactory.cpp | 14 +++++++------- src/multimediawidgets/multimediawidgets.pro | 2 +- src/plugins/plugins.pro | 7 +++++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index 73a9d65..f0706e3 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/audio/audio.pri @@ -39,7 +39,8 @@ SOURCES += \ audio/qaudiodecoder.cpp \ audio/qaudiohelpers.cpp -mac { +mac:!ios { + PRIVATE_HEADERS += audio/qaudioinput_mac_p.h \ audio/qaudiooutput_mac_p.h \ audio/qaudiodeviceinfo_mac_p.h \ @@ -49,7 +50,6 @@ mac { audio/qaudiooutput_mac_p.cpp \ audio/qaudioinput_mac_p.cpp \ audio/qaudio_mac.cpp - LIBS += -framework ApplicationServices -framework CoreAudio -framework AudioUnit -framework AudioToolbox } diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/audio/qaudiodevicefactory.cpp index 1199073..76f1227 100644 --- a/src/multimedia/audio/qaudiodevicefactory.cpp +++ b/src/multimedia/audio/qaudiodevicefactory.cpp @@ -52,7 +52,7 @@ #include "qaudiodeviceinfo_win32_p.h" #include "qaudiooutput_win32_p.h" #include "qaudioinput_win32_p.h" -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_MAC) && !defined(Q_OS_IOS) #include "qaudiodeviceinfo_mac_p.h" #include "qaudiooutput_mac_p.h" #include "qaudioinput_mac_p.h" @@ -137,7 +137,7 @@ QList QAudioDeviceFactory::availableDevices(QAudio::Mode mode) { QList devices; #ifndef QT_NO_AUDIO_BACKEND -#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) +#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA)) foreach (const QByteArray &handle, QAudioDeviceInfoInternal::availableDevices(mode)) devices << QAudioDeviceInfo(QLatin1String("builtin"), handle, mode); #endif @@ -170,7 +170,7 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice() #endif #ifndef QT_NO_AUDIO_BACKEND -#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) +#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA)) return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultInputDevice(), QAudio::AudioInput); #endif #endif @@ -190,7 +190,7 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultOutputDevice() #endif #ifndef QT_NO_AUDIO_BACKEND -#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) +#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA)) return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultOutputDevice(), QAudio::AudioOutput); #endif #endif @@ -202,7 +202,7 @@ QAbstractAudioDeviceInfo* QAudioDeviceFactory::audioDeviceInfo(const QString &re QAbstractAudioDeviceInfo *rc = 0; #ifndef QT_NO_AUDIO_BACKEND -#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) +#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA)) if (realm == QLatin1String("builtin")) return new QAudioDeviceInfoInternal(handle, mode); #endif @@ -234,7 +234,7 @@ QAbstractAudioInput* QAudioDeviceFactory::createInputDevice(QAudioDeviceInfo con if (deviceInfo.isNull()) return new QNullInputDevice(); #ifndef QT_NO_AUDIO_BACKEND -#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) +#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA)) if (deviceInfo.realm() == QLatin1String("builtin")) { QAbstractAudioInput* p = new QAudioInputPrivate(deviceInfo.handle()); if (p) p->setFormat(format); @@ -261,7 +261,7 @@ QAbstractAudioOutput* QAudioDeviceFactory::createOutputDevice(QAudioDeviceInfo c if (deviceInfo.isNull()) return new QNullOutputDevice(); #ifndef QT_NO_AUDIO_BACKEND -#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) +#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA)) if (deviceInfo.realm() == QLatin1String("builtin")) { QAbstractAudioOutput* p = new QAudioOutputPrivate(deviceInfo.handle()); if (p) p->setFormat(format); diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro index fe8f6d5..c6f2146 100644 --- a/src/multimediawidgets/multimediawidgets.pro +++ b/src/multimediawidgets/multimediawidgets.pro @@ -28,7 +28,7 @@ SOURCES += \ qvideowidgetcontrol.cpp \ qvideowidget.cpp -mac { +mac:!ios { !simulator { PRIVATE_HEADERS += qpaintervideosurface_mac_p.h OBJECTIVE_SOURCES += qpaintervideosurface_mac.mm diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 998713f..8f751ae 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -45,8 +45,11 @@ unix:!mac { } mac:!simulator { - SUBDIRS += audiocapture qt7 + SUBDIRS += audiocapture - config_avfoundation: SUBDIRS += avfoundation + !ios { + SUBDIRS += qt7 + config_avfoundation: SUBDIRS += avfoundation + } } -- 2.7.4