Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: Ifd122e78933870e39e0e79d78930931d8ce10dba

7 files changed, 82 insertions, 85 deletions

diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri
index d6d74a316..388124205 100644
--- a/src/multimedia/audio/audio.pri
+++ b/src/multimedia/audio/audio.pri
@@ -41,13 +41,10 @@ SOURCES += \
            audio/qaudiohelpers.cpp
 
 qtConfig(pulseaudio) {
-    QMAKE_USE += pulseaudio
-
-    DEFINES += QT_MULTIMEDIA_PULSEAUDIO
+    QMAKE_USE_FOR_PRIVATE += pulseaudio
     PRIVATE_HEADERS += audio/qsoundeffect_pulse_p.h
     SOURCES += audio/qsoundeffect_pulse_p.cpp
 } else {
-    DEFINES += QT_MULTIMEDIA_QAUDIO
     PRIVATE_HEADERS += audio/qsoundeffect_qaudio_p.h
     SOURCES += audio/qsoundeffect_qaudio_p.cpp
 }
diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp
index f8b8d7b18..556ba1193 100644
--- a/src/multimedia/audio/qsoundeffect.cpp
+++ b/src/multimedia/audio/qsoundeffect.cpp
@@ -37,11 +37,12 @@
 **
 ****************************************************************************/
 
+#include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include "qsoundeffect.h"
 
-#if defined(QT_MULTIMEDIA_PULSEAUDIO)
+#if QT_CONFIG(pulseaudio)
 #include "qsoundeffect_pulse_p.h"
-#elif(QT_MULTIMEDIA_QAUDIO)
+#else
 #include "qsoundeffect_qaudio_p.h"
 #endif
 
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 9d3d26b0e..685298905 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -257,9 +257,15 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QCamera::LockTypes)
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
+QT_WARNING_DISABLE_GCC("-Wfloat-equal")
+
 Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator==(const QCamera::FrameRateRange &r1, const QCamera::FrameRateRange &r2) Q_DECL_NOTHROW
 { return r1.minimumFrameRate == r2.minimumFrameRate && r1.maximumFrameRate == r2.maximumFrameRate; }
 
+QT_WARNING_POP
+
 Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator!=(const QCamera::FrameRateRange &r1, const QCamera::FrameRateRange &r2) Q_DECL_NOTHROW
 { return !(r1 == r2); }
 
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json
index 8fb2eb868..2d51102f5 100644
--- a/src/multimedia/configure.json
+++ b/src/multimedia/configure.json
@@ -10,7 +10,8 @@
             "alsa": "boolean",
             "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] },
             "pulseaudio": "boolean",
-            "wmf-backend": "boolean"
+            "mediaplayer-backend": { "type": "string", "values": [ "directshow", "wmf" ] },
+            "wmf-backend": { "type": "void", "name": "mediaplayer-backend", "value": "wmf" }
         }
     },
 
@@ -178,7 +179,7 @@
     "features": {
         "alsa": {
             "label": "ALSA",
-            "condition": "config.unix && libs.alsa",
+            "condition": "config.unix && !config.qnx && libs.alsa",
             "output": [ "feature", "privateFeature" ]
         },
         "avfoundation": {
@@ -192,6 +193,13 @@
             "condition": "config.win32 && libs.directshow",
             "output": [ "feature", "privateFeature" ]
         },
+        "directshow-player": {
+            "label": "DirectShow",
+            "enable": "input.mediaplayer-backend == 'directshow'",
+            "disable": "input.mediaplayer-backend == 'wmf'",
+            "condition": "features.directshow && !features.wmf-player",
+            "output": [ "privateFeature" ]
+        },
         "evr": {
             "label": "evr.h",
             "condition": "config.win32 && tests.evr",
@@ -274,18 +282,23 @@
         "wmsdk": {
             "label": "wmsdk.h",
             "condition": "config.win32 && tests.wmsdk",
-            "output": [ "feature", "privateFeature" ]
+            "output": [ "privateFeature" ]
         },
         "wshellitem": {
             "label": "WShellItem",
             "condition": "config.win32 && features.directshow && tests.wshellitem",
             "output": [ "feature", "privateFeature" ]
         },
-        "wmf-backend": {
+        "wmf": {
             "label": "Windows Media Foundation",
-            "emitIf": "config.win32",
-            "autoDetect": false,
-            "condition": "libraries.wmf",
+            "condition": "config.win32 && libs.wmf",
+            "output": [ "privateFeature" ]
+        },
+        "wmf-player": {
+            "label": "Windows Media Foundation",
+            "enable": "input.mediaplayer-backend == 'wmf'",
+            "disable": "input.mediaplayer-backend != 'wmf'",
+            "condition": "features.wmf",
             "output": [ "privateFeature" ]
         }
     },
@@ -307,7 +320,14 @@
                 "mmrenderer",
                 "avfoundation",
                 "directshow",
-                "wmf-backend"
+                "wmf",
+                {
+                    "message": "Media player backend",
+                    "type": "firstAvailableFeature",
+                    "args": "directshow-player wmf-player",
+                    "condition": "config.win32"
+                }
+
             ]
         }
     ]
diff --git a/src/multimedia/doc/src/platform-notes-ios.qdoc b/src/multimedia/doc/src/platform-notes-ios.qdoc
new file mode 100644
index 000000000..81e9ea0c5
--- /dev/null
+++ b/src/multimedia/doc/src/platform-notes-ios.qdoc
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** 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 The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qtmultimedia-ios.html
+\title Qt Multimedia on iOS
+\brief Platform notes for iOS
+
+This page covers the availability of Qt Multimedia features on iOS.
+
+\section1 Limitations
+
+Since Qt Multimedia for iOS uses the camera, the \c Info.plist assigned to
+QMAKE_INFO_PLIST in the project file must contain the key
+\c NSCameraUsageDescription. Otherwise the application will
+abort on startup. See Info.plist documentation from Apple for more information
+regarding this key.
+
+*/
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index 553732fd1..dfc9c3f15 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -158,6 +158,7 @@
 
      \list
       \li \l{Qt Multimedia on Windows}{Windows}
+      \li \l{Qt Multimedia on iOS}{iOS}
      \endlist
 
     \section2 Reference
diff --git a/src/multimedia/qtmultimediadefs.h b/src/multimedia/qtmultimediadefs.h
deleted file mode 100644
index f0042faf6..000000000
--- a/src/multimedia/qtmultimediadefs.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QTMULTIMEDIA_P_H
-#define QTMULTIMEDIA_P_H
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_STATIC
-#    if defined(QT_BUILD_MULTIMEDIA_LIB)
-#        define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
-#    else
-#        define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
-#    endif
-#else
-#    define Q_MULTIMEDIA_EXPORT
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QMULTIMEDIA_P_H
-