From f0f62057c9333adf3e201c124a13574947348cfb Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@digia.com>
Date: Tue, 19 Nov 2013 13:25:54 +0100
Subject: [PATCH 1/2] iOS: Remove duplicate class name from qmldir

It was added twice, which breaks the build when using Multimedia on iOS

Change-Id: I0b5f08bc57d5d558fb060b00d5bdeb4149499a0d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
---
 src/imports/multimedia/qmldir | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir
index 428bfc8d..3d2d7c46 100644
--- a/src/imports/multimedia/qmldir
+++ b/src/imports/multimedia/qmldir
@@ -3,4 +3,3 @@ plugin declarative_multimedia
 classname QMultimediaDeclarativeModule
 typeinfo plugins.qmltypes
 Video 5.0 Video.qml
-classname QMultimediaDeclarativeModule

From 041e75d1c099a937a16759ad40aee4d83e2316f6 Mon Sep 17 00:00:00 2001
From: Andreas Holzammer <andreas.holzammer@kdab.com>
Date: Thu, 21 Nov 2013 14:20:15 +0100
Subject: [PATCH 2/2] Add mmrenderer configure check

No all QNX versions/variations have a mmrenderer by
default, so we need to check for it, otherwise
it fails to compile.

Change-Id: I3efe9df37cf7807c1b0ac4d2e8f49aa02e3408cd
Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 config.tests/mmrenderer/mmrenderer.pro     |  6 +++
 config.tests/mmrenderer/mmrenderertest.cpp | 50 ++++++++++++++++++++++
 qtmultimedia.pro                           |  2 +
 src/plugins/plugins.pro                    |  3 +-
 4 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 config.tests/mmrenderer/mmrenderer.pro
 create mode 100644 config.tests/mmrenderer/mmrenderertest.cpp

diff --git a/config.tests/mmrenderer/mmrenderer.pro b/config.tests/mmrenderer/mmrenderer.pro
new file mode 100644
index 00000000..cc1e21e8
--- /dev/null
+++ b/config.tests/mmrenderer/mmrenderer.pro
@@ -0,0 +1,6 @@
+SOURCES = mmrenderertest.cpp
+
+CONFIG -= qt
+
+LIBS += -lmmrndclient -lstrm
+
diff --git a/config.tests/mmrenderer/mmrenderertest.cpp b/config.tests/mmrenderer/mmrenderertest.cpp
new file mode 100644
index 00000000..90942696
--- /dev/null
+++ b/config.tests/mmrenderer/mmrenderertest.cpp
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <mm/renderer.h>
+
+int main(int argc,char **argv)
+{
+    mmr_connect(0);
+
+    return 0;
+}
+
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 489f81fa..404a2bf5 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -16,6 +16,8 @@ win32 {
     SDK_ROOT = $$(ANDROID_SDK_ROOT)
     isEmpty(SDK_ROOT): SDK_ROOT = $$DEFAULT_ANDROID_SDK_ROOT
     !exists($$SDK_ROOT/platforms/android-11/android.jar): error("QtMultimedia for Android requires API level 11")
+} else:qnx {
+    qtCompileTest(mmrenderer)
 } else {
     qtCompileTest(alsa)
     qtCompileTest(pulseaudio)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 4c70e3d1..d947f3b2 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -13,7 +13,8 @@ android {
 }
 
 qnx {
-    SUBDIRS += qnx audiocapture
+    config_mmrenderer: SUBDIRS += qnx
+    SUBDIRS += audiocapture
 }
 
 qnx:!blackberry {