7 files changed, 7 insertions, 134 deletions
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
index 7fd6259ea..5ba7fcc25 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
@@ -47,8 +47,6 @@
 #include "qmediaservice.h"
 #include "qmediaplayercontrol.h"
 #include "qmediaplayer.h"
-#include "qradiotuner.h"
-#include "qradiodata.h"
 #include "qvideowidget.h"
 #include "qcameraimagecapture.h"
 #include "qcamera.h"
@@ -63,7 +61,6 @@ class MediaExample : public QObject {
 
     void MediaControl();
     void MediaPlayer();
-    void RadioTuna();
     void MediaRecorder();
     void AudioRecorder();
     void EncoderSettings();
@@ -84,8 +81,6 @@ private:
     QCameraViewfinder *viewfinder;
     QCameraImageCapture *imageCapture;
     QString fileName;
-    QRadioTuner *radio;
-    QRadioData *radioData;
     QAudioRecorder *audioRecorder;
     QAudioProbe *audioProbe;
     QVideoProbe *videoProbe;
@@ -93,8 +88,6 @@ private:
     QMediaContent image1;
     QMediaContent image2;
     QMediaContent image3;
-
-    static const int yourRadioStationFrequency = 11;
 };
 
 void MediaExample::MediaControl()
@@ -298,25 +291,6 @@ void MediaExample::AudioRecorder()
     //! [Audio recorder inputs]
 }
 
-void MediaExample::RadioTuna()
-{
-    //! [Radio tuner]
-    radio = new QRadioTuner;
-    connect(radio, SIGNAL(frequencyChanged(int)), this, SLOT(freqChanged(int)));
-    if (radio->isBandSupported(QRadioTuner::FM)) {
-        radio->setBand(QRadioTuner::FM);
-        radio->setFrequency(yourRadioStationFrequency);
-        radio->setVolume(100);
-        radio->start();
-    }
-    //! [Radio tuner]
-
-    //! [Radio data setup]
-    radio = new QRadioTuner;
-    radioData = radio->radioData();
-    //! [Radio data setup]
-}
-
 void MediaExample::AudioProbe()
 {
     //! [Audio probe]
diff --git a/src/multimedia/doc/src/changes.qdoc b/src/multimedia/doc/src/changes.qdoc
index 65bc88073..fd7188fa3 100644
--- a/src/multimedia/doc/src/changes.qdoc
+++ b/src/multimedia/doc/src/changes.qdoc
@@ -53,7 +53,6 @@ There are a number of new features in Qt Multimedia:
 \li More examples and documentation
 \li QSound moved from Qt GUI to Qt Multimedia
 \li QSoundEffect available to C++ now, as well as QML
-\li FM Radio Data System classes and types now available (\l QRadioData, \l RadioData)
 \li Various other API improvements and bugfixes
 \endlist
 
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index ad8273612..dcf394c87 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -28,12 +28,12 @@
 /*!
 \page multimediaoverview.html
 \title Multimedia
-\brief A set of APIs for working with audio, video, radio and camera devices.
+\brief A set of APIs for working with audio, video and camera devices.
 
 Multimedia support in Qt is provided by the \l{Qt Multimedia} module. The Qt
 Multimedia module provides a rich feature set that enables you to easily take
 advantage of a platform's multimedia capabilities such as media playback and
-the use of camera and radio devices.
+the use of camera devices.
 
 \section1 Features
 
@@ -44,7 +44,6 @@ Here are some examples of what can be done with Qt Multimedia APIs:
 \li Play low latency sound effects
 \li Play media files in playlists (such as compressed audio or video files)
 \li Record audio and compress it
-\li Tune and listen to radio stations
 \li Use a camera, including viewfinder, image capture, and movie recording
 \li Play 3D positional audio with \l{Qt Audio Engine QML Types}{Qt Audio Engine}
 \li Decode audio media files into memory for processing
@@ -61,7 +60,6 @@ available here:
 \li \l {Audio Overview}
 \li \l {Video Overview}
 \li \l {Camera Overview}
-\li \l {Radio Overview}
 \endlist
 
 \section1 Multimedia Recipes
@@ -119,11 +117,6 @@ For some quick recipes, look at the overviews above and consult this table:
         \li \l {MediaPlayer}, \l VideoOutput
         \li QMediaPlayer, QAbstractVideoSurface, QVideoFrame
     \row
-        \li Listening to the radio
-        \li \l {Declarative Radio Example}{declarative-radio}
-        \li \l Radio, \l RadioData
-        \li QRadioTuner, QRadioData
-    \row
         \li Accessing camera viewfinder
         \li \l {Camera Example}{camera},
             \l {QML Camera Example}{declarative-camera}
diff --git a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
index 053dd3de7..f75ecbfe2 100644
--- a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
@@ -31,7 +31,7 @@
     \ingroup modules
     \qtvariable multimedia
 
-    \brief The \l {Qt Multimedia} module provides audio, video, radio and camera
+    \brief The \l {Qt Multimedia} module provides audio, video and camera
     functionality.
 
     To enable Qt Multimedia in a project, add this directive into the
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index abd6a62cc..13c686978 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -28,12 +28,12 @@
 /*!
     \page qtmultimedia-index.html
     \title Qt Multimedia
-    \brief The Qt Multimedia module provides APIs for audio, video, radio, and
+    \brief The Qt Multimedia module provides APIs for audio, video and
     camera-related functionality.
 
     Qt Multimedia is an essential module that provides a rich set of QML types
     and C++ classes to handle multimedia content. It also provides necessary
-    APIs to access the camera and radio functionality. The included
+    APIs to access the camera functionality. The included
     \l{Qt Audio Engine QML Types}{Qt Audio Engine} provides types for
     3D positional audio playback and content management.
 
@@ -98,9 +98,6 @@
      \li Add media playback functionality to a scene. It is same as Audio type,
      but can be used for video playback with the VideoOutput type.
     \row
-     \li \l {QtMultimedia::Radio}{Radio}
-     \li Access radio functionality
-    \row
      \li \l {QtMultimedia::Video}{Video}
      \li Add Video playback functionality to a scene. It uses MediaPlayer and
      VideoOutput types to provide video playback functionality.
@@ -124,7 +121,7 @@
      \li Capture still images with a camera.
     \row
      \li QMediaRecorder
-     \li Record media content from a camera or radio tuner source.
+     \li Record media content from a camera source.
     \row
      \li QMediaPlayer
      \li Playback media from a source.
@@ -153,7 +150,6 @@
       \li \l{Audio Overview}
       \li \l{Video Overview}
       \li \l{Camera Overview}
-      \li \l{Radio Overview}
      \endlist
 
     \section2 Platform Notes
diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc
index a2aaa1a80..461cc716f 100644
--- a/src/multimedia/doc/src/qtmultimedia5.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia5.qdoc
@@ -34,7 +34,7 @@
 The QML types for \l{Qt Multimedia} support the basic use cases such as:
 \list
  \li audio and video playback,
- \li access camera and radio functionality,
+ \li access camera functionality,
  \li record video,
  \li and access camera settings.
 \endlist
diff --git a/src/multimedia/doc/src/radiooverview.qdoc b/src/multimedia/doc/src/radiooverview.qdoc
deleted file mode 100644
index 7dcad72d0..000000000
--- a/src/multimedia/doc/src/radiooverview.qdoc
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-
-\page radiooverview.html
-\title Radio Overview
-\brief An API to control system radio tuner
-
-The Qt Multimedia API provides a number of radio related classes for control
-over the radio tuner of the system, and gives access to Radio Data System
-(RDS) information for radio stations that broadcasts it.
-
-\section1 Radio Features
-
-The Radio API consists of two separate components. The radio tuner,
-\l QRadioTuner or the \l Radio QML type, which handles control of
-the radio hardware as well as tuning. The other is the radio data
-component, either \l QRadioData or the \l RadioData QML type, which
-gives access to RDS information.
-
-\section1 Radio Implementation Details
-
-The actual level of support depends on the underlying system support. It should
-be noted that only analog radio is supported, and the properties of the radio
-data component will only be populated if the system radio tuner supports RDS.
-
-\section1 Examples
-
-There are two examples showing the usage of the Radio API. One shows how to use
-the QRadioTuner class from C++. The other shows how to implement a similar
-application using QML and \l Radio.
-
-\section2 Radio Example
-
-This image shows the example using the QRadioTuner API.
-
-\image radio-example.png
-
-The example reads the frequency from the radio tuner, and sets the "Got Signal"
-text based on the signal strength. The buttons allow the user to tune and scan
-up and down the frequency band, while the slider to the side allows volume
-adjustments.
-
-Only the FM frequency band is used in this example.
-
-\section2 Declarative Radio Example
-
-\image declarative-radio-example.png
-
-This example has the same functionality of the regular radio example mentioned
-above, but it includes a nice horizontal dial showing the position of the
-current frequency inside the band.
-
-\section1 Reference documentation
-
-\section2 C++ Classes
-
-\annotatedlist multimedia_radio
-
-\section2 QML Types
-
-\annotatedlist multimedia_radio_qml
-
-*/