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

Conflicts:
	src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
	src/plugins/wmf/mftvideo.cpp

Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc

2 files changed, 0 insertions, 46 deletions

diff --git a/src/multimediawidgets/doc/qtmultimediawidgets.qdocconf b/src/multimediawidgets/doc/qtmultimediawidgets.qdocconf
deleted file mode 100644
index 4d36dae89..000000000
--- a/src/multimediawidgets/doc/qtmultimediawidgets.qdocconf
+++ /dev/null
@@ -1,44 +0,0 @@
-include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-
-project                 = QtMultimediaWidgets
-description             = Qt Multimedia Widgets Documentation
-version                 = $QT_VERSION
-
-# The following parameters are for creating a qhp file, the qhelpgenerator
-# program can convert the qhp file into a qch file which can be opened in
-# Qt Assistant and/or Qt Creator.
-
-# Defines the name of the project. You cannot use operators (+, =, -) in
-# the name. Properties for this project are set using a qhp.<projectname>.property
-# format.
-qhp.projects = QtMultimediaWidgets
-qhp.QtMultimediaWidgets.file = qtmultimediawidgets.qhp
-qhp.QtMultimediaWidgets.namespace = org.qt-project.qtmultimediawidgets.$QT_VERSION_TAG
-qhp.QtMultimediaWidgets.indexTitle = Qt Multimedia Widgets
-qhp.QtMultimediaWidgets.virtualFolder  = qtmultimediawidgets
-
-# For listing child nodes in Qt Creator or Assistant.
-qhp.QtMultimediaWidgets.subprojects = classes
-qhp.QtMultimediaWidgets.subprojects.classes.title = C++ Classes
-qhp.QtMultimediaWidgets.subprojects.classes.indexTitle = Qt Multimedia Widgets C++ Classes
-qhp.QtMultimediaWidgets.subprojects.classes.selectors = class fake:headerfile
-qhp.QtMultimediaWidgets.subprojects.classes.sortPages = true
-
-exampledirs += ../../../examples/multimediawidgets \
-               snippets
-
-# Specify example install dir under QT_INSTALL_EXAMPLES
-examplesinstallpath = qtmultimedia/multimediawidgets
-
-headerdirs += ../
-
-imagedirs += \
-
-sourcedirs += ../
-
-excludedirs +=
-
-depends                 += qtcore qtdoc qtquick qtqml qtmultimedia qtwidgets qtgui
-
-navigation.landingpage = "Qt Multimedia Widgets"
-navigation.cppclassespage = "Qt Multimedia Widgets C++ Classes"
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index 1cf35986f..ec96be57c 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -7,8 +7,6 @@ qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) {
    DEFINES += QT_NO_OPENGL
 }
 
-QMAKE_DOCS = $$PWD/doc/qtmultimediawidgets.qdocconf
-
 load(qt_module)
 
 PRIVATE_HEADERS += \