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

Conflicts:
	sync.profile

Change-Id: I450b86e3d01498aca12fe11a28527a296f2cbc3f

.gitignore

@@ -41,3 +41,6 @@ src/multimediawidgets/qtmultimediawidgetsversion.h
 tst_*
 !tst_*.cpp
 tests/auto/cmake/build
+
+# Generated static plugin import sources
+*_plugin_import.cpp

.qmake.conf

@@ -1 +1,2 @@
 load(qt_build_config)
+CONFIG += qt_example_installs

dist/changes-5.0.1

@@ -0,0 +1,51 @@
+Qt 5.0.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+

examples/audiodecoder/audiodecoder.pro

@@ -1,20 +0,0 @@
-TEMPLATE = app
-TARGET = audiodecoder
-
-CONFIG += qt warn_on
-
-HEADERS = \
-    audiodecoder.h \
-    wavefilewriter.h
-SOURCES = main.cpp \
-    audiodecoder.cpp \
-    wavefilewriter.cpp
-
-QT += multimedia
-CONFIG += console
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodecoder
-sources.files = $$SOURCES $$HEADERS audiodecoder.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodecoder
-INSTALLS += target sources

examples/audiodevices/audiodevices.pro

@@ -1,19 +0,0 @@
-TEMPLATE = app
-TARGET = audiodevices
-
-QT += multimedia
-
-HEADERS       = audiodevices.h
-
-SOURCES       = audiodevices.cpp \
-                main.cpp
-
-FORMS        += audiodevicesbase.ui
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
-
-INSTALLS += target sources
-
-QT+=widgets

examples/audioengine/audioengine.pro

@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-
-# These examples contain no C++ and can simply be copied
-SUBDIRS =
-sources.files = doc qml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioengine
-INSTALLS += sources
-
-OTHER_FILES += qml/*.qml qml/*.qmlproject qml/content/*
-

examples/audioinput/audioinput.pro

@@ -1,15 +0,0 @@
-TEMPLATE = app
-TARGET = audioinput
-
-QT += multimedia widgets
-
-HEADERS       = audioinput.h
-
-SOURCES       = audioinput.cpp \
-                main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
-
-INSTALLS += target sources

examples/audiooutput/audiooutput.pro

@@ -1,15 +0,0 @@
-TEMPLATE = app
-TARGET = audiooutput
-
-QT += multimedia widgets
-
-HEADERS       = audiooutput.h
-
-SOURCES       = audiooutput.cpp \
-                main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
-
-INSTALLS += target sources

examples/customvideosurface/customvideosurface.pro

@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += customvideoitem customvideowidget
-
-# install
-sources.files = customvideosurface.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface
-INSTALLS += sources

examples/customvideosurface/customvideowidget/customvideowidget.pro

@@ -1,21 +0,0 @@
-TEMPLATE = app
-TARGET = customvideowidget
-
-QT += multimedia multimediawidgets widgets
-
-HEADERS = \
-    videoplayer.h \
-    videowidget.h \
-    videowidgetsurface.h
-
-SOURCES = \
-    main.cpp \
-    videoplayer.cpp \
-    videowidget.cpp \
-    videowidgetsurface.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideowidget
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideowidget
-
-INSTALLS += target sources

examples/declarative-camera/declarative-camera.pro

@@ -1,13 +0,0 @@
-TEMPLATE=app
-TARGET=declarative-camera
-
-QT += quick qml multimedia
-
-SOURCES += qmlcamera.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-camera
-sources.files = $$SOURCES *.pro images *.qml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-camera
-INSTALLS += target sources
-

examples/declarative-radio/declarative-radio.pro

@@ -1,12 +0,0 @@
-QT += qml quick multimedia
-
-SOURCES += main.cpp
-RESOURCES += declarative-radio.qrc
-
-OTHER_FILES += view.qml
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-radio
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro doc view.qml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-radio
-INSTALLS += target sources

examples/examples.pro

@@ -1,31 +1,3 @@
 TEMPLATE = subdirs
-
+SUBDIRS += multimedia multimediawidgets
-SUBDIRS += audiodecoder
-
-# These examples all need widgets for now (using creator templates that use widgets)
-!isEmpty(QT.widgets.name) {
-    SUBDIRS += \
-        radio \
-        camera \
-        spectrum \
-        audiorecorder \
-        audiodevices \
-        audioinput \
-        audiooutput \
-        videographicsitem \
-        videowidget \
-        player \
-        customvideosurface
-
-    QT += widgets
-}
-
-!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) {
-    disabled:SUBDIRS += declarative-camera
-    SUBDIRS += \
-        declarative-radio \
-        video
-}
-
-config_openal: SUBDIRS += audioengine
 

examples/multimedia/audiodecoder/audiodecoder.pro

@@ -0,0 +1,15 @@
+TEMPLATE = app
+TARGET = audiodecoder
+
+HEADERS = \
+    audiodecoder.h \
+    wavefilewriter.h
+SOURCES = main.cpp \
+    audiodecoder.cpp \
+    wavefilewriter.cpp
+
+QT += multimedia
+CONFIG += console
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodecoder
+INSTALLS += target

examples/multimedia/audiodevices/audiodevices.pro

@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = audiodevices
+
+QT += multimedia
+
+HEADERS       = audiodevices.h
+
+SOURCES       = audiodevices.cpp \
+                main.cpp
+
+FORMS        += audiodevicesbase.ui
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodevices
+INSTALLS += target
+
+QT+=widgets

examples/multimedia/audiodevices/doc/src/audiodevices.qdoc

@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audiodevices
+    \example multimedia/audiodevices
     \title Audio Devices Example
-    \ingroup audio_examples
+    \ingroup multimedia_examples
     \brief The Audio Devices example shows the application of the audio devices APIs
 
 

examples/multimedia/audioengine/audioengine.pro

@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+
+# These examples contain no C++ and can simply be copied
+SUBDIRS =
+EXAMPLE_FILES = qml
+

examples/multimedia/audioengine/doc/src/audioengine.qdoc

@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audioengine
+    \example multimedia/audioengine
     \title AudioEngine Example
-    \ingroup audioengine_examples
+    \ingroup multimedia_examples
     \brief The Audio Engine example demonstrates 3D sound control using
     the QtAudioEngine API.
 

examples/multimedia/audioinput/audioinput.pro

@@ -0,0 +1,12 @@
+TEMPLATE = app
+TARGET = audioinput
+
+QT += multimedia widgets
+
+HEADERS       = audioinput.h
+
+SOURCES       = audioinput.cpp \
+                main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audioinput
+INSTALLS += target

examples/multimedia/audioinput/doc/src/audioinput.qdoc

@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audioinput
+    \example multimedia/audioinput
     \title Audio Input Example
-    \ingroup audio_examples
+    \ingroup multimedia_examples
     \brief The Audio Input Example shows the use of the QAudioInput class.
     The example demonstrates the basic use cases of the QAudioInput class.
 

examples/multimedia/audiooutput/audiooutput.pro

@@ -0,0 +1,12 @@
+TEMPLATE = app
+TARGET = audiooutput
+
+QT += multimedia widgets
+
+HEADERS       = audiooutput.h
+
+SOURCES       = audiooutput.cpp \
+                main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiooutput
+INSTALLS += target

examples/multimedia/audiooutput/doc/src/audiooutput.qdoc

@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audiooutput
+    \example multimedia/audiooutput
     \title Audio Output Example
-    \ingroup audio_examples
+    \ingroup multimedia_examples
     \brief The Audio Output Example show the use of the QAudioOutput API.
 
     The example demonstrates the basic use cases of the QAudioOutput class.

examples/multimedia/audiorecorder/audiorecorder.pro

@@ -20,10 +20,7 @@ maemo*: {
     FORMS += audiorecorder.ui
 }
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiorecorder
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
+INSTALLS += target
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
-
-INSTALLS += target sources
 
 QT+=widgets

examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc

@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audiorecorder
+    \example multimedia/audiorecorder
     \title Audio Recorder Example
-    \ingroup audio_examples
+    \ingroup multimedia_examples
     \brief The Audio Recorder Example shows how to create a simple audio recorder.
 
     It demonstrates the discovery of the supported devices and codecs and the use
@@ -95,10 +95,6 @@
     \code
     ui->statusbar->showMessage(tr("Recorded %1 sec").arg(duration / 1000));
     \endcode
-
-
-
-
 */
 
 

examples/multimedia/declarative-radio/declarative-radio.pro

@@ -0,0 +1,9 @@
+QT += qml quick multimedia
+
+SOURCES += main.cpp
+RESOURCES += declarative-radio.qrc
+
+EXAMPLE_FILES += view.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/declarative-radio
+INSTALLS += target

examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc

@@ -26,10 +26,13 @@
 ****************************************************************************/
 
 /*!
-    \example declarative-radio
+    \example multimedia/declarative-radio
     \title Declarative Radio Example
+    \brief Demonstrates the radio functionality
+    \ingroup multimedia_examples
 
-
+    This examples uses the Qt Multimedia Radio QML type to list the available
+    channels on the FM frequency.
 */
 
 

examples/multimedia/multimedia.pro

@@ -0,0 +1,23 @@
+TEMPLATE = subdirs
+
+SUBDIRS += audiodecoder
+
+# These examples all need widgets for now (using creator templates that use widgets)
+!isEmpty(QT.widgets.name) {
+    SUBDIRS += \
+        radio \
+        spectrum \
+        audiorecorder \
+        audiodevices \
+        audioinput \
+        audiooutput \
+}
+
+!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) {
+    SUBDIRS += \
+        declarative-radio \
+        video
+}
+
+config_openal: SUBDIRS += audioengine
+

examples/multimedia/radio/radio.pro

@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = radio
+
+QT += multimedia
+
+HEADERS = \
+    radio.h
+
+SOURCES = \
+    main.cpp \
+    radio.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/radio
+INSTALLS += target
+
+QT+=widgets

examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro

@@ -37,11 +37,8 @@ macx {
     DESTDIR = ../..$${spectrum_build_dir}
 }
 
-# Install
+EXAMPLE_FILES = bwins/fftreal.def eabi/fftreal.def readme.txt license.txt
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/spectrum
-sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt
+INSTALLS += target
-sources.files += bwins/fftreal.def eabi/fftreal.def
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/3rdparty/fftreal
-INSTALLS += sources target